Created
October 14, 2015 05:03
-
-
Save bcdady/25065e63e1564ca06b42 to your computer and use it in GitHub Desktop.
Set kdiff3 (from TortoiseHG) as Git mergetool
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [mergetool "kdiff3"] | |
| cmd = \"c:\program files/TortoiseHg/kdiff3.exe\" '-auto' \"$BASE\" \"$LOCAL\" \"$REMOTE\" '-o' \"$MERGED\" | |
| trustExitCode = false |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment