[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: CVS merge
|
From: |
Johan Bockgård |
|
Subject: |
Re: CVS merge |
|
Date: |
Tue, 24 Apr 2007 12:33:43 +0200 |
|
User-agent: |
Gnus/5.110006 (No Gnus v0.6) Emacs/22.0.93 (gnu/linux) |
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