Created
October 28, 2016 00:11
-
-
Save dela3499/866f3e9d5611639fa077f39490979c72 to your computer and use it in GitHub Desktop.
Git merging
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
| # http://stackoverflow.com/questions/11133290/git-merging-using-meld | |
| [merge] | |
| tool = mymeld | |
| conflictstyle = diff3 | |
| [mergetool "mymeld"] | |
| cmd = meld --diff $BASE $LOCAL --diff $BASE $REMOTE --diff $LOCAL $BASE $REMOTE $MERGED | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment