non-graphical merge tool

[Pierre-Yves David]

On 05/14/2014 06:36 PM, Michael Mossey wrote:
> 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?

I suggest you to read `hg help merge-tools` that explains your option 
for configuring merge tools.

-- 
Pierre-Yves David