meld-auto meld-noauto
Created originally on Bitbucket by daschuer
Like kdiff3 TortoiseHG should support both option for meld
Here is my meld settings for auto merge:
[merge-tools] meld-auto.regkey=SOFTWARE\Meld meld-auto.regkeyalt=SOFTWARE\Wow6432Node\Meld meld-auto.regname=Executable meld-auto.gui=True meld-auto.priority=-2 meld-auto.args=$local $base $other --auto-merge -o $output meld-auto.checkchanged=True meld-auto.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child meld-auto.diff3args=-a --label='$plabel1' $parent1 --label='$clabel' $child --label='$plabel2' $parent2 meld-auto.dirdiff=True
This should also be considered together with Issue #4973 (closed) Auto should use the merge tool merging features. nonauto should allow to continue a mercurial merged file.