unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Glenn Morris <rgm@gnu.org>
Cc: 10709@debbugs.gnu.org, Wolfgang Schnerring <wosc@wosc.de>
Subject: bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts
Date: Fri, 30 Nov 2012 23:42:04 -0500	[thread overview]
Message-ID: <jwv38zqz8nx.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <mhy5hiinhl.fsf@fencepost.gnu.org> (Glenn Morris's message of "Fri, 30 Nov 2012 20:12:54 -0500")

> The detection of a conflict is poor and Needs Work. With bzr we have

Maybe we should ask on a Mercurial list how it can be done (and turn it
into a feature request if there's no good answer)?


        Stefan





  reply	other threads:[~2012-12-01  4:42 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
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 [this message]
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

  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=jwv38zqz8nx.fsf-monnier+emacs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=10709@debbugs.gnu.org \
    --cc=rgm@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 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).