Skip to content

Instantly share code, notes, and snippets.

@sjl
Created July 13, 2011 20:41
Show Gist options
  • Save sjl/1081271 to your computer and use it in GitHub Desktop.
Save sjl/1081271 to your computer and use it in GitHub Desktop.
[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
$ 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