Skip to content

Instantly share code, notes, and snippets.

@victor-torres

victor-torres/.hgrc

Created November 17, 2017 14:28
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save victor-torres/9fb12fd9b27c833557f61a1a319b3cd3 to your computer and use it in GitHub Desktop.
Save victor-torres/9fb12fd9b27c833557f61a1a319b3cd3 to your computer and use it in GitHub Desktop.
Download ZIP
configuring meld merge tool in mercurial
Raw
.hgrc
[ui]
merge = meld
[extensions]
extdiff =
[merge-tools]
meld.args = $local $base $other --output=$output
@victor-torres
Copy link
Author

I'm using p4merge now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment