non-graphical merge tool

[Michael Mossey]

On Wed, May 14, 2014 at 11:10 PM, Dirk Heinrichs <dhs at recommind.com> wrote:

>  Am 15.05.2014 03:36, schrieb Michael Mossey:
>
>  If he runs "hg merge" I don't want it to pop him into kdiff3 as he
> probably won't understand it.
>
>
> Educating him is not an option?
>
> Theoretically it's an option but he not even a programmer to tell the
truth. He's paying me to help him and our time is probably better spent
working on other things, letting me handle merges.

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