How just to intercept merging "conflicts", nothing else

[Giovanni Gherdovich]

On Wed, Feb 5, 2014 at 2:03 PM, Simon King <simon at simonking.org.uk> wrote:
>
> [...]
> I think the way TortoiseHG does it is to run the merge with
> "--tool=internal:fail". For files which require a merge, this leaves
> the contents alone but marks them as unresolved.
>

Interesting.
As you say, and as written in `hg help mergetools`,

::::    "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.

it makes no difference between files which have conflicts
and files that would merge peacefully (say, because the edits on the two
sides
were far apart).

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