Difference tool configuration in git

Beyond Compare

Opens a Text Merge view with the specified files in the left, right, and center panes. For example:

BCompare.exe C:\Left.ext C:\Right.ext C:\Center.ext

Opens a Text Merge view with the specified files in the left, right, center, and output panes. For example:

BCompare.exe C:\Left.ext C:\Right.ext C:\Center.ext C:\Output.ext

Opens the specified files in the associated file view. For example:

bcomp %base %mine /title1=%bname /title2=%yname

Opens a Text Merge view with the specified files in the left, right, center, and output panes. For example:

bcomp %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname

Three-Way File and Directory Comparison

kdiff3 %base %mine %theirs -o %merged --L1 %bname --L2 %yname --L3 %tname

Automated comparisons and merges.

kdiff3 --auto file1.txt file2.txt -o merged.txt