From: Glenn Morris <rgm@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 19545@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 [thread overview]
Message-ID: <yhy4pb3ljh.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <834ms057w7.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 09 Jan 2015 16:46:32 +0200")
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
next prev parent reply other threads:[~2015-01-09 17:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-09 14:46 bug#19545: 24.4.51; VC doesn't support SMerge mode with Git back-end Eli Zaretskii
2015-01-09 17:34 ` Glenn Morris [this message]
2018-06-06 0:10 ` Noam Postavsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=yhy4pb3ljh.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=19545@debbugs.gnu.org \
--cc=eliz@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.