From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kai Grossjohann Newsgroups: gmane.emacs.help Subject: Re: CVS merge Date: Tue, 24 Apr 2007 13:23:45 +0200 Message-ID: <86d51ukoce.fsf@ketchup.de.uu.net> References: <1177410606.504367.202630@n15g2000prd.googlegroups.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1177413870 26764 80.91.229.12 (24 Apr 2007 11:24:30 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 24 Apr 2007 11:24:30 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Tue Apr 24 13:24:28 2007 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1HgJ8D-0006dR-R3 for geh-help-gnu-emacs@m.gmane.org; Tue, 24 Apr 2007 13:24:26 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HgJDi-0007e5-Sw for geh-help-gnu-emacs@m.gmane.org; Tue, 24 Apr 2007 07:30:06 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HgJDV-0007di-AD for help-gnu-emacs@gnu.org; Tue, 24 Apr 2007 07:29:53 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HgJDS-0007dV-Q2 for help-gnu-emacs@gnu.org; Tue, 24 Apr 2007 07:29:53 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HgJDS-0007dS-NK for help-gnu-emacs@gnu.org; Tue, 24 Apr 2007 07:29:50 -0400 Original-Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1HgJ7w-0005gd-TW for help-gnu-emacs@gnu.org; Tue, 24 Apr 2007 07:24:09 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1HgJ7p-0000Ey-9g for help-gnu-emacs@gnu.org; Tue, 24 Apr 2007 13:24:01 +0200 Original-Received: from de-lt-054776l.eu.frd.uu.net ([62.191.185.105]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 24 Apr 2007 13:24:01 +0200 Original-Received: from kai by de-lt-054776l.eu.frd.uu.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 24 Apr 2007 13:24:01 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 18 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: de-lt-054776l.eu.frd.uu.net User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.0.97 (gnu/linux) Cancel-Lock: sha1:tSPRyihlJBpFCub64w4EO6Xy9xA= X-detected-kernel: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:43060 Archived-At: rocher 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