Contents tagged with diff
-
Merge two files with kdiff3, starting from the command line.
Run kdiff3 file1 file2 -m -o file2 This will open kdiff3 to merge file1 and file2 and to save the results into file2. Resolve all the conflicts by choosing A or B for each conflict. Save, noting … more