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

Previous Next

Package: emacs;

Reported by: Wolfgang Schnerring <wosc <at> wosc.de>

Date: Fri, 3 Feb 2012 16:32:01 UTC

Severity: wishlist

Fixed in version 24.4

Done: Glenn Morris <rgm <at> gnu.org>

Bug is archived. No further changes may be made.

Full log

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

From: Stefan Monnier <monnier <at> iro.umontreal.ca>
To: Wolfgang Schnerring <wosc <at> wosc.de>
Cc: 10709 <at> debbugs.gnu.org, Glenn Morris <rgm <at> gnu.org>
Subject: Re: bug#10709: Feature request: vc-hg should activate smerge-mode for
	conflicts
Date: Fri, 03 Feb 2012 14:32:38 -0500

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

So you're saying that hg uses standard conflict markers in its
internal:merge code?  Wonderful.

>> Actually I guess vc-hg would need some changes too.
> Yep, I guess you'd need changes on both ends.

Apparently only vc-hg.el needs to be changed, then.


        Stefan
This bug report was last modified 12 years and 168 days ago.

Previous Next

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