Command line option not to start merge tool in hg merge

[Bastian Doetsch]

Am Sonntag, den 29.06.2008, 13:37 -0500 schrieb 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"
> 


I just tested this and it works :-)).

Mercurial returns with return code 1, though. In my opinion, it should
exit with 0, as the parameter tells Mercurial, I don't want the merges
resolved right now. Is this a bug?

Speaking about return codes: Is there a list of return codes somewhere
where I can see, which command returns which return code in which
situation?

Speaking 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20080629/681a4513/attachment.htm 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Dies ist ein digital signierter Nachrichtenteil
Url : http://selenic.com/pipermail/mercurial/attachments/20080629/681a4513/attachment.pgp