GNU bug report logs - #19545
24.4.51; VC doesn't support SMerge mode with Git back-end

Previous Next

Package: emacs;

Reported by: Eli Zaretskii <eliz <at> gnu.org>

Date: Fri, 9 Jan 2015 14:47:02 UTC

Severity: normal

Found in version 24.4.51

Fixed in version 25.1

Done: Noam Postavsky <npostavs <at> gmail.com>

Bug is archived. No further changes may be made.

Full log

View this message in rfc822 format

From: Glenn Morris <rgm <at> gnu.org>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: 19545 <at> debbugs.gnu.org
Subject: bug#19545: 24.4.51; VC doesn't support SMerge mode with Git back-end
Date: Fri, 09 Jan 2015 12:34:42 -0500

You want to backport

http://lists.gnu.org/archive/html/emacs-diffs/2014-08/msg00102.html
http://lists.gnu.org/archive/html/emacs-diffs/2014-08/msg00103.html

which should be attributed to Rudiger Sonderfeld, apart from
vc-git-resolve-when-done.


BTW, it would be nice is someone fixed this properly at some point;
ref http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01126.html
This bug report was last modified 7 years and 49 days ago.

Previous Next

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