Skip to content

Diff with Comparit!

Jump to bottom Edit New page
aldendaniels edited this page Jul 2, 2013 · 1 revision

Caveat. I've confirmed that this works for diffing. I've not tried the merge command.

Add the following to the .git\config file:

[diff]
	tool = compareit
[merge]
	tool = compareit
[difftool "compareit"]
	cmd = \\"C:/Program Files (x86)/Compare It!/wincmp3.exe\\" \\"$LOCAL\\" //=\\"Old Version\\" \\"$REMOTE\\"
[mergetool "compareit"]
	cmd = \\"C:/Program Files (x86)/Compare It!/wincmp3.exe\\" \\"$LOCAL\\" //=\\"Old Version\\" \\"$REMOTE\\"
	trustExitCode = false
Add a custom footer
Add a custom sidebar
Clone this wiki locally