Command line option not to start merge tool in hg merge

[Matt Mackall]

On Sun, 2008-06-29 at 12:01 +0200, Bastian Doetsch wrote:
> Hi,
> 
> I was wondering, if there is an option to tell mercurial not to start
> a merge tool after a merge with conflicts (and still exit with return
> code 0). 
> 
> The reason I'm asking for it is, that for the Eclipse plug-in we don't
> need a merge tool, as merges can be done from within Eclipse. On the
> other hand, I wouldn't want to lose the merge-tool configuration when
> I'm working on the command line. Any suggestions?

Yes, --config "ui.merge=internal:fail"

-- 
Mathematics is the supreme nostalgia of our time.