Merging

[Matt Mackall]

On Thu, 2010-06-10 at 19:54 -0300, Hatem Nassrat wrote:
> My question is, is it possible (without writing a script that uses rcs
> to do the merge) to do the svn thing with the different file versions
> and the merged file with the <<< >>> markers or even pause like Git?
> if so, how?

http://mercurial.selenic.com/wiki/MergeToolConfiguration

Choosing internal merge with conflict markers

To have the internal merge with the conflict markers for example in
TortoiseHg set 

[ui]
merge = internal:merge

in Mercurial.ini. 

-- 
Mathematics is the supreme nostalgia of our time.