Subject: Re: bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts

From: Wolfgang Schnerring <[email-masked]>
Date: Fri, 3 Feb 2012 19:27:36 +0100

* Glenn Morris <[email-masked]> [2012-02-03 12:11]:
> Glenn Morris wrote:
> > I guess you need to get hg to generate standard conflict markers. Ref:

You could configure diff3 as the default merge program.
However, in my experience, using smerge-mode on the "internal:merge"
results of hg worked, too.
 
> Actually I guess vc-hg would need some changes too.

Yep, I guess you'd need changes on both ends.

Wolfgang