GNU bug report logs - #10709
Feature request: vc-hg should activate smerge-mode for conflicts

Previous Next

Full log

Message #14 received at 10709 <at> debbugs.gnu.org (full text, mbox):

From: Wolfgang Schnerring <wosc <at> wosc.de>
To: Glenn Morris <rgm <at> gnu.org>
Cc: 10709 <at> debbugs.gnu.org
Subject: Re: bug#10709: Feature request: vc-hg should activate smerge-mode
	for conflicts
Date: Fri, 3 Feb 2012 19:27:36 +0100

[Message part 1 (text/plain, inline)]

* Glenn Morris <rgm <at> gnu.org> [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

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.