Last active
April 24, 2018 19:36
-
-
Save mrfratello/8800906f1bd5a93a940d to your computer and use it in GitHub Desktop.
SmartSynchronize as merge tool for mercurial on Windows
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
| [extdiff] | |
| cmd.smarts = C:\Program Files (x86)\SmartSynchronize\bin\smartsynchronize.exe | |
| [merge-tools] | |
| smarts.args = $local $other $base | |
| smarts.executable= C:\Program Files (x86)\SmartSynchronize\bin\smartsynchronize.exe | |
| smarts.priority = 1000 | |
| smarts.premerge=False | |
| smarts.checkconflict=True | |
| smarts.binary=True | |
| smarts.gui=True | |
| [extensions] | |
| color = | |
| extdiff = | |
| [ui] | |
| merge-tools = smarts |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
You should add
smarts.checkchanged = True, otherwise TortoiseHg will automatically consider conflicts as solved even if you don't touch anything.