From: bojohan+news@dd.chalmers.se (Johan Bockgård)
To: help-gnu-emacs@gnu.org
Subject: Re: CVS merge
Date: Tue, 24 Apr 2007 12:33:43 +0200 [thread overview]
Message-ID: <yoijd51ujc3c.fsf@gamma02.me.chalmers.se> (raw)
In-Reply-To: 1177410606.504367.202630@n15g2000prd.googlegroups.com
rocher <francesc.rocher@gmail.com> writes:
> After a CVS merge with a command like 'cvs update -kk -j HEAD', files
> with conflicts have regions like this:
>
> <<<<<<< file.cpp
> local version
> =======
> newer version
>>>>>>>> file.cpp (cvs-version)
>
> Is there a way in Emacs to automatically select one of these regions
> and to remove the other?
M-x vc-resolve-conflicts
--
Johan Bockgård
next prev parent reply other threads:[~2007-04-24 10:33 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 [this message]
2007-04-24 11:23 ` Kai Grossjohann
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=yoijd51ujc3c.fsf@gamma02.me.chalmers.se \
--to=bojohan+news@dd.chalmers.se \
--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.
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).