Re: How just to intercept merging “conflicts”, nothing else

[Scott Palmer]

On Wed, Feb 5, 2014 at 2:40 AM, Pietro Moras <studio-pm at hotmail.com> wrote:

> The simplest, more direct way for instructing (i.e.: configuring)
> Mercurial (I mean: just Mercurial, no other products, nor tools):
> – Please just intercept possible source merge “conflicts”, nothing else,
> as I intend to take full responsibility of them.
>
>
> I kindly ask a practical suggestion on this topic as, after having read
> such notes as “MergeToolConfiguration – Mercurial”, I feel more confused
> than before.
> And, please, if you don't appreciate such a question, I'd appreciate if
> you just ignored it. Thanks!
> - P.M.
>

hg help merge-tool
...
   "internal:fail"
      Rather than attempting to merge files that were modified on both
      branches, it marks them as unresolved. The resolve command must be
used
      to resolve these conflicts.
...

so I think you want:

hg merge -tool internal:fail


Cheers,

Scott
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140205/b849148f/attachment-0002.html>