From: Kai Grossjohann <kai@emptydomain.de>
To: help-gnu-emacs@gnu.org
Subject: Re: CVS merge
Date: Tue, 24 Apr 2007 13:23:45 +0200 [thread overview]
Message-ID: <86d51ukoce.fsf@ketchup.de.uu.net> (raw)
In-Reply-To: 1177410606.504367.202630@n15g2000prd.googlegroups.com
rocher <francesc.rocher@gmail.com> writes:
> Is there a way in Emacs to automatically select one of these regions
> [produced by "cvs update" when there are conflicts] and to remove
> the other?
M-x smerge-mode RET
That does not automatically select regions but provides convenient
keybindings to navigate between conflicts and to choose the A or B
variant.
Another possibility is to type d E on the file in the buffer produced
by M-x cvs-update RET. That gives you the same functionality with a
different UI.
Kai
prev parent reply other threads:[~2007-04-24 11:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-24 10:30 CVS merge rocher
2007-04-24 10:33 ` Johan Bockgård
2007-04-24 11:23 ` Kai Grossjohann [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=86d51ukoce.fsf@ketchup.de.uu.net \
--to=kai@emptydomain.de \
--cc=help-gnu-emacs@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.