|
|
rocher <francesc.rocher@xxxxxxxxx> 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
_______________________________________________
help-gnu-emacs mailing list
help-gnu-emacs@xxxxxxx
http://lists.gnu.org/mailman/listinfo/help-gnu-emacs
|
|