Option to not trigger a resolve after merge
Laurens Holst
laurens.nospam at grauw.nl
Fri Nov 9 10:42:31 CST 2012
Op 09-11-12 17:38, dukeofgaming schreef:
> No, I didn't know that could be done but that is exactly what I
> wanted... however, where did that "internal:fail" value come from?, I
> couldn't find it in the user documentation.
hg help merge-tools
http://www.selenic.com/repo/hg/help/merge-tools
Note that you may also be interested in internal:local.
~Laurens
More information about the Mercurial-devel
mailing list