From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Dan Nicolaescu <dann@ics.uci.edu>
Cc: emacs-devel@gnu.org
Subject: Re: VC needs a mechanism to turn on smerge-mode in case of conflics
Date: Sun, 13 Jan 2008 16:56:37 -0500 [thread overview]
Message-ID: <jwvk5mdqtjw.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <200801132018.m0DKIZRN029597@oogie-boogie.ics.uci.edu> (Dan Nicolaescu's message of "Sun, 13 Jan 2008 12:18:35 -0800")
> Currently smerge-mode gets turned on if emacs detects a conflict when
> doing a merge/update. But if the merge is done from the command line or
> some other tool, the version control system might know there's conflict.
> But VC does not turn on smerge-mode when doing C-x C-f on a file with
> conflicts.
> It would be nice if there was a way to do this.
Indeed. It already does that in the Arch and SVN backends.
Stefan
next prev parent reply other threads:[~2008-01-13 21:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-13 20:18 VC needs a mechanism to turn on smerge-mode in case of conflics Dan Nicolaescu
2008-01-13 21:56 ` Stefan Monnier [this message]
2008-01-14 8:44 ` Dan Nicolaescu
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvk5mdqtjw.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=dann@ics.uci.edu \
--cc=emacs-devel@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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).