AutoMergeCmd can merge different text file versions into a single result file. It finds changes made in version files; detects changes, conflicts and constructs output file with changes merged.
Usage: {AutoMergeCmd[.exe] /o[utput]=resultFileName /s[ource]=sourceFileName /c[hanged]=changedFileName[,changedFileName]}
Where:
resultFileName - name of output file with merged changes
sourceFileName - initial unchanged file name
changedFileName - name of modified file based on source file

The license of this software is Free, you can free download and free use this file converter software.