hg merge preview

[Mads Kiilerich]

On 08/31/2011 03:06 PM, Martin Geisler wrote:
> Peter Toft<pto at linuxbog.dk>  writes:
>> Especially the merge problem identification would be really nice.
>>
>> Are there better means to analyze the effect of hg merges before doing
>> them?
>
> Not really -- to identify the problems you will have to run (simulate)
> the merge process. So the best you can do is to do it non-interactively
> and then revert back to where you were.
>
> Start the merge with:
>
>    $ hg merge --tool internal:merge

- at which point you can look for conflict markers in the files to see 
where there are conflicting edits.

You can also easily see the diff relative to each of the potential parents:
   hg diff -r 'p1()'
   hg diff -r 'p2()'
(see 'hg help revset')

If you don't care about that you can use internal:fail instead.

/Mads