Skip to content

Instantly share code, notes, and snippets.

@gregkepler
Created February 12, 2019 20:20
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/4628252a7221060b2b3edaf64389d83a to your computer and use it in GitHub Desktop.
Save gregkepler/4628252a7221060b2b3edaf64389d83a to your computer and use it in GitHub Desktop.
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = \"C:\\Program Files (x86)\\Meld\\Meld.exe\" "$LOCAL" "$REMOTE"
[merge]
tool = meld
[mergetool "meld"]
cmd = \"C:\\Program Files (x86)\\Meld\\Meld.exe\" "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment