help-gnu-emacs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

CVS merge

From: rocher
Subject: CVS merge
Date: 24 Apr 2007 03:30:06 -0700
User-agent: G2/1.0 
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
reply via email to
[Prev in Thread] Current Thread [Next in Thread]