2010/09/30

Avoid mercurial auto merge

Just put this in mercurial.ini :

[ui]
merge=kdiff3

[merge-tools]
kdiff3.premerge=false
kdiff3.args=--L1 base --L2 local --L3 other $base $local $other -o $output