Last active
January 1, 2016 02:28
-
-
Save dylanPowers/8079055 to your computer and use it in GitHub Desktop.
Git merging on 'roids
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
| # .gitconfig snippet | |
| [merge] | |
| tool = superMerge | |
| conflictstyle = diff3 | |
| [mergetool "superMerge"] | |
| cmd = \"C:/Program Files (x86)/Git/bin/superMerge\" $BASE $LOCAL $REMOTE $MERGED |
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
| #!/bin/sh | |
| # Obviously change this to where meld is located | |
| meld='/c/Program Files (x86)/Meld/meld/meld.exe' | |
| # Uncomment these if you want to see a comparison to base. It's useless if you | |
| # have diff3 enabled for a conflict style. | |
| #`"$meld" $2 $1` & | |
| # sleep 0.5 | |
| #`"$meld" $1 $3` & | |
| `"$meld" $2 $4 $3` |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment