Created
November 11, 2018 17:56
-
-
Save pamtrak06/f16e6a08cdbc2677861cc53d1b8a391f to your computer and use it in GitHub Desktop.
Configure git to include meld - osx
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
| # Set in .git/gitconfig | |
| [diff] | |
| tool = meld | |
| [difftool] | |
| prompt = false | |
| [difftool "meld"] | |
| trustExitCode = true | |
| cmd = open -W -a Meld --args \"$LOCAL\" \"$REMOTE\" | |
| [merge] | |
| tool = meld | |
| [mergetool] | |
| prompt = false | |
| [mergetool "meld"] | |
| trustExitCode = true | |
| cmd = open -W -a Meld --args --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output=\"$MERGED\" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment