Skip to content

Instantly share code, notes, and snippets.

@gregkepler
Created November 1, 2017 17:21
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save gregkepler/55e6dea505d623a835cd8aff050733b9 to your computer and use it in GitHub Desktop.
Save gregkepler/55e6dea505d623a835cd8aff050733b9 to your computer and use it in GitHub Desktop.
Meld diff and merge tool for git on Windows
# ------------------ M E R G E -------------------------
[merge]
tool = meld
[mergetool "meld"]
cmd = \"C:\\Program Files (x86)\\Meld\\Meld.exe\" --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output \"$MERGED\" --label \"MERGE (REMOTE BASE MY)\"
trustExitCode = false
[mergetool]
# don't ask if we want to skip merge
prompt = false
# don't create backup *.orig files
keepBackup = false
# ------------------ D I F F -------------------------
[diff]
guitool = meld
[difftool "meld"]
cmd = \"C:\\Program Files (x86)\\Meld\\Meld.exe\" \"$LOCAL\" \"$REMOTE\" --label \"DIFF (ORIGINAL MY)\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment