Option to not trigger a resolve after merge
Pierre-Yves David
pierre-yves.david at logilab.fr
Fri Nov 9 09:48:09 CST 2012
On Fri, Nov 09, 2012 at 10:38:01AM -0500, dukeofgaming wrote:
> Hi,
>
> Sometimes I already know what files are going to have conflicts and what
> side of the merge I will want to try to keep. If for some reason I get
> conflicts with binary files (say, images) and there are 100 conflicts, what
> I would like to see is something like:
>
> hg merge -R
did you tried hg merge --tool internal:fail
--
Pierre-Yves David
http://www.logilab.fr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20121109/9cdfae40/attachment.pgp>
More information about the Mercurial-devel
mailing list