Created
July 13, 2011 20:41
-
-
Save sjl/1081271 to your computer and use it in GitHub Desktop.
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-tools] | |
keepthat.executable = sh | |
keepthat.args = -c 'cp $local $output.original && cp $other $output' | |
keepthat.premerge = True | |
[alias] | |
merge-preferring-theirs = merge --tool keepthat |
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
$ hg merge-preferring-theirs | |
... | |
performs a merge, and for any files with conflicts it will | |
use the other revision's version of that file, while copying | |
your current revision's version to a "*.original" file. | |
... | |
$ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment