Tortoise HG – 2.0.5 – Setting KDiff to Not Automerge

I’m using KDiff as my merge tool in Tortoise HG 2.0.5

My issue is that if I select “Tool Resolve” in Tortoise when I have conflicts and it’s able to auto resolve. I can’t edit the file in KDiff after the fact.

Solution: I turn auto off.

In TortoiseHG:

File -> Settings -> Edit File Button

Add a merge-tools section and override the default kdiff.args as below.
(NOTE: The default can be found in <PROGRAM_FILES>\TortoiseHG\hgrc.d\MergeTools.rc) Commented in below FYI

  • All I did was turn auto off so it will prompt you on every merge.
[merge-tools]
#kdiff3.args=--auto --L1 base --L2 parent1 --L3 parent2 $base $local $other -o $output
kdiff3.args=--L1 base --L2 parent1 --L3 parent2 $base $local $other -o $output

Actually I don’t really like the default names they have for merging (parent1, parent2) so I use:

kdiff3.args=--L1 base --L2 local --L3 other $base $local $other -o $output

It's only fair to share...
Share on FacebookGoogle+Tweet about this on TwitterShare on LinkedIn

Leave a Reply