basic Mercurial merge “conflicts” tool

[Marcin Kasperski]

Pietro Moras <studio-pm at hotmail.com> writes:

> I kindly ask suggestions about what's the best basic off-the-shelf
> Mercurial configuration for facing possible merge “conflicts”.

>From my experience (introducing to Mercurial various coworkers), 
using kdiff3 seems most friendly and easy to pick up. In case
of any conflict you get nice display of basic version, both conflicted
versions, and result, and you can pick or edit preferable version
using clickety-menus or shortcuts keys, as you prefer.

To use it, find your merge tools configuration (in my case,
/etc/mercurial/hgrc.d/mergetools.rc) and ensure kdiff3.priority
is highest (for example, type
    kdiff3.priority=10
)

PS There is nothing to fear in merge, just do it a few times. The
excercise is trivial:

a) create some file, fill with some (reasonable, not glibberish) text,
   commit it
b) add a few sentences, commit
c) hg update to the version before this commit (so you see text as after a)
d) make some changes, different than in point b), but - at least
   partially - in the same places, commit
   { you get two heads }
e) hg merge, and enjoy merging your changes