non-graphical merge tool

[Michael Mossey]

I'm working on Windows in a two-developer project, and the other guy is not
an experienced programmer. If he runs "hg merge" I don't want it to pop him
into kdiff3 as he probably won't understand it. I would rather that
Mercurial leave conflicting merges in the file with merge marks so he can
send it off to me to fix. How would I set Mercurial to do a non-graphical
merge in the presence of conflicts, i.e. leave merge marks?

Mike
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140514/c766ce86/attachment-0002.html>