Command line option not to start merge tool in hg merge

Bastian Doetsch bastian.doetsch at gmx.de
Sun Jun 29 05:01:18 CDT 2008


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?

Best regards,
Bastian
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20080629/be466b2a/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/be466b2a/attachment.pgp 


More information about the Mercurial mailing list