Created
May 11, 2012 03:37
-
-
Save dpwright/2657379 to your computer and use it in GitHub Desktop.
Telling git to use our custom merge drivers
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
| *.exe -crlf -diff merge=keep-mine | |
| *.tga -crlf -diff merge=keep-mine |
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
| [merge "keep-mine"] | |
| name = Always keep mine during merge | |
| driver = git-merge-keep-mine.sh %O %A %B | |
| [merge "keep-theirs"] | |
| name = Always keep theirs during merge | |
| driver = git-merge-keep-theirs.sh %O %A %B |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment