Created
November 17, 2017 14:28
-
-
Save victor-torres/9fb12fd9b27c833557f61a1a319b3cd3 to your computer and use it in GitHub Desktop.
configuring meld merge tool in mercurial
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
| [ui] | |
| merge = meld | |
| [extensions] | |
| extdiff = | |
| [merge-tools] | |
| meld.args = $local $base $other --output=$output |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
I'm using p4merge now.