gnu.emacs.help
[Top] [All Lists]

CVS merge

Subject: CVS merge
From: rocher
Date: 24 Apr 2007 03:30:06 -0700
Newsgroups: gnu.emacs.help
Hi,

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?


Bye,
---
Francesc Rocher

_______________________________________________
help-gnu-emacs mailing list
help-gnu-emacs@xxxxxxx
http://lists.gnu.org/mailman/listinfo/help-gnu-emacs

<Prev in Thread] Current Thread [Next in Thread>