non-graphical merge tool

[Pierre-Yves David]

On 05/14/2014 07:07 PM, Dave S wrote:
> On Wed, May 14, 2014 at 6:36 PM, Michael Mossey <michaelmossey at gmail.com
> <mailto:michaelmossey at gmail.com>> 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?
>
>
> Maybe use the "internal:fail" merge-tool, and then hg resolve -l ?
> (easily done with a .bat or .sh file)

"internal:fail"? that sounds fairly sub-optimal. The one that leave 
conflict marker around is "internal:merge"

-- 
Pierre-Yves David