Last active
December 26, 2015 20:49
-
-
Save peterdemin/7211467 to your computer and use it in GitHub Desktop.
Git settings for using Meld under Windows. (C:\Users\user\.gitconfig) Note: Meld's executable path must not contain spaces or non-ascii characters!
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
| [merge] | |
| tool = meld | |
| [mergetool "meld"] | |
| prompt = false | |
| keepBackup = false | |
| keepTemporaries = false | |
| path = C:/Meld/meld/meld.exe | |
| cmd = "/c/Meld/meld/meld.exe $PWD/$LOCAL $PWD/$BASE $PWD/$REMOTE --output=$PWD/$MERGED" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment