Skip to content

Instantly share code, notes, and snippets.

@simon-brooke
Created June 3, 2017 13:24
Show Gist options
  • Save simon-brooke/31845cba31d554d227545c87bcda7bf8 to your computer and use it in GitHub Desktop.
Save simon-brooke/31845cba31d554d227545c87bcda7bf8 to your computer and use it in GitHub Desktop.
Windows .gitconfig for Meld
[user]
email = [email protected]
name = Simon Brooke
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
path = C:\\Program Files (x86)\\Meld\\meld.exe
# cmd = '\"/c/Program Files (x86)/Meld/meld.exe\" $PWD/$LOCAL $PWD/$REMOTE'
[merge]
tool = meld
[mergetool "meld"]
path = C:\\Program Files (x86)\\Meld\\meld.exe
keepBackup = false
trustExitCode = false
# cmd = '\"/c/Program Files (x86)/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