From: Stefan Monnier <monnier@iro.umontreal.ca>
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 14:32:38 -0500 [thread overview]
Message-ID: <jwvty37hfwz.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <20120203182736.GC1786@elzar.wosc.de> (Wolfgang Schnerring's message of "Fri, 3 Feb 2012 19:27:36 +0100")
>> > I guess you need to get hg to generate standard conflict markers. Ref:
> You could configure diff3 as the default merge program.
> However, in my experience, using smerge-mode on the "internal:merge"
> results of hg worked, too.
So you're saying that hg uses standard conflict markers in its
internal:merge code? Wonderful.
>> Actually I guess vc-hg would need some changes too.
> Yep, I guess you'd need changes on both ends.
Apparently only vc-hg.el needs to be changed, then.
Stefan
next prev parent reply other threads:[~2012-02-03 19:32 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 [this message]
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=jwvty37hfwz.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--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.