From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Barry Warsaw <barry@python.org>
Cc: emacs-devel@gnu.org
Subject: Re: smerge-mode is fantastic, but it annoys me
Date: Tue, 03 Mar 2015 13:10:21 -0500 [thread overview]
Message-ID: <jwvpp8q7y1i.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <20150303095333.6dea82e2@anarchist.wooz.org> (Barry Warsaw's message of "Tue, 3 Mar 2015 09:53:33 -0500")
> Me too! I didn't know about smerge-auto-leave, so I'm giving that a try
> (thanks Nicolas!). Now to generate some conflicts...
C-SPC ... C-SPC ... M-x smerge-makeup-conflict
Stefan
prev parent reply other threads:[~2015-03-03 18:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-03 1:47 smerge-mode is fantastic, but it annoys me Daniel Colascione
2015-03-03 12:49 ` Nicolas Richard
2015-03-03 16:43 ` Stefan Monnier
2015-03-04 12:43 ` Nicolas Richard
2015-03-04 12:56 ` Ivan Shmakov
2015-03-04 14:15 ` Nicolas Richard
2015-03-04 16:33 ` John Yates
2015-03-06 4:24 ` Nicolas Richard
2015-03-03 14:53 ` Barry Warsaw
2015-03-03 18:10 ` Stefan Monnier [this message]
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=jwvpp8q7y1i.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=barry@python.org \
--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 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.