help-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: CVS merge


From: Kai Grossjohann
Subject: Re: CVS merge
Date: Tue, 24 Apr 2007 13:23:45 +0200
User-agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.0.97 (gnu/linux)

rocher <francesc.rocher@gmail.com> writes:

> Is there a way in Emacs to automatically select one of these regions
> [produced by "cvs update" when there are conflicts] and to remove
> the other?

M-x smerge-mode RET

That does not automatically select regions but provides convenient
keybindings to navigate between conflicts and to choose the A or B
variant.

Another possibility is to type d E on the file in the buffer produced
by M-x cvs-update RET.  That gives you the same functionality with a
different UI.

Kai






reply via email to

[Prev in Thread] Current Thread [Next in Thread]