From: Glenn Morris <rgm@gnu.org>
To: Wolfgang Schnerring <wosc@wosc.de>
Cc: 10709@debbugs.gnu.org
Subject: bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts
Date: Fri, 03 Feb 2012 12:04:54 -0500 [thread overview]
Message-ID: <m2y5sjonk9.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <20120203163029.GB1786@elzar.wosc.de> (Wolfgang Schnerring's message of "Fri, 3 Feb 2012 17:30:29 +0100")
Wolfgang Schnerring wrote:
> vc-svn has the useful behaviour (via vc-svn-find-file-hook) that when
> you visit a file with conflicts, it drops you into smerge-mode, and
> automatically marks the file as resolved once you've removed all
> conflict markers. This makes for a very seamless editing experience. :-)
>
> It would be nice if vc-hg did the same.
I guess you need to get hg to generate standard conflict markers. Ref:
https://lists.ubuntu.com/archives/bazaar/2012q1/074313.html
next prev parent reply other threads:[~2012-02-03 17:04 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-03 16:30 bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts Wolfgang Schnerring
2012-02-03 17:04 ` Glenn Morris [this message]
2012-02-03 17:11 ` Glenn Morris
2012-02-03 18:27 ` Wolfgang Schnerring
2012-02-03 19:32 ` Stefan Monnier
2012-02-04 9:46 ` Wolfgang Schnerring
2012-02-06 13:27 ` Stefan Monnier
2012-02-03 18:43 ` Stefan Monnier
2012-12-01 1:12 ` Glenn Morris
2012-12-01 4:42 ` Stefan Monnier
2012-12-05 1:53 ` Glenn Morris
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=m2y5sjonk9.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=10709@debbugs.gnu.org \
--cc=wosc@wosc.de \
/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.