How just to intercept merging "conflicts", nothing else

Marcin Kasperski Marcin.Kasperski at mekk.waw.pl
Wed Feb 5 14:56:27 UTC 2014


> 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).
>

internal:merge merges peacefully those which can be merged and leave the
rest unresolved... Not sure what exactly are you trying to achieve but
as somebody already said: just merge and check state afterwards.

Note that hg merge does not commit, it is your responsibility to decide
whether to commit, or not (or make some edits before the commit).

PS "In-memory" merge can be more-or-less achieved by:

   hg clone .  /some/temp/dir/on/tmpfs
   cd /some/temp/dir/on/tmpfs/ 
   hg merge





More information about the Mercurial mailing list