Skip to content

Instantly share code, notes, and snippets.

@marconvcm

marconvcm/meld

Last active September 19, 2019 23:59
Show Gist options
  • Save marconvcm/64d043ac316ca3c7113a4c3b1cba0b59 to your computer and use it in GitHub Desktop.
Save marconvcm/64d043ac316ca3c7113a4c3b1cba0b59 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
meld
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"
[merge]
tool = meld
[mergetool "meld"]
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment