Lost changes during merges

[Pavel Shevaev]

> There are circumstances where using kdiff3 without the arguments we
> provide in the mergetools.hgrc file cause bad merge behaviors.  Check
> the developer's ui.merge and mergetool configurations.

Thanks for the tip. I'm using a simple non-gui "merge" tool from the
rcs package and completely happy about it. However other members of
the team use meld or kdiff3, if it's a kdiff3's fault I think I'm
going to enforce the usage of the simple merge.

-- 
Best regards, Pavel