Last active
June 22, 2020 09:34
-
-
Save r3code/9939178be7ca83755f4b5b93d8a02325 to your computer and use it in GitHub Desktop.
Gitconfig to set Mela as default diff and mergetool for git
This file contains hidden or 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
| diff] | |
| tool = meld | |
| [difftool] | |
| prompt = false | |
| [difftool "meld"] | |
| trustExitCode = true | |
| cmd = open -W -a Meld --args \"$LOCAL\" \"$PWD/$REMOTE\" | |
| [merge] | |
| tool = meld | |
| [mergetool] | |
| prompt = false | |
| [mergetool "meld"] | |
| trustExitCode = true | |
| cmd = open -W -a Meld --args --auto-merge \"$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
Must use $PWD in command or Meld can't find any file being merged