Created
May 25, 2013 00:53
-
-
Save bregenspan/5647470 to your computer and use it in GitHub Desktop.
Git merge config to use Meld as merge tool (with the middle pane representing the merge target, unlike the crappy default where middle pane is BASE)
This file contains 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
| [merge] | |
| tool = mymeld | |
| conflictstyle = diff3 | |
| [mergetool "mymeld"] | |
| cmd = meld --diff $LOCAL $MERGED $REMOTE |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment