From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Rasmus Pank Roulund Newsgroups: gmane.emacs.help Subject: Ediff and merge Date: Fri, 15 May 2009 21:34:23 +0200 Message-ID: <87octuupmo.fsf@rasmus.WORKGROUP> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1242416119 21204 80.91.229.12 (15 May 2009 19:35:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 15 May 2009 19:35:19 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Fri May 15 21:35:12 2009 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 1M53BV-0006rt-SE for geh-help-gnu-emacs@m.gmane.org; Fri, 15 May 2009 21:35:10 +0200 Original-Received: from localhost ([127.0.0.1]:35159 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M53BV-0001Cr-BH for geh-help-gnu-emacs@m.gmane.org; Fri, 15 May 2009 15:35:09 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M53BA-0001Cm-6V for help-gnu-emacs@gnu.org; Fri, 15 May 2009 15:34:48 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M53B4-0001C5-2F for help-gnu-emacs@gnu.org; Fri, 15 May 2009 15:34:46 -0400 Original-Received: from [199.232.76.173] (port=34016 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M53B3-0001C2-VC for help-gnu-emacs@gnu.org; Fri, 15 May 2009 15:34:42 -0400 Original-Received: from main.gmane.org ([80.91.229.2]:38656 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 1M53B3-0001e1-Jr for help-gnu-emacs@gnu.org; Fri, 15 May 2009 15:34:41 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1M53Az-0008OY-ND for help-gnu-emacs@gnu.org; Fri, 15 May 2009 19:34:37 +0000 Original-Received: from port293.ds1-aboes.adsl.cybercity.dk ([212.242.226.46]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 15 May 2009 19:34:37 +0000 Original-Received: from rasmus.pank by port293.ds1-aboes.adsl.cybercity.dk with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 15 May 2009 19:34:37 +0000 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 14 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: port293.ds1-aboes.adsl.cybercity.dk User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.92 (gnu/linux) Cancel-Lock: sha1:0fH9AfOatG/zw9rcKRteAjLDMqY= X-detected-operating-system: by monty-python.gnu.org: GNU/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:64475 Archived-At: Hello, I have a simple and probably simple question on ediff and merge. I use SVN. Sometimes conflicts happens. I try to resolve them with Ediff. I use the 3files mode and use "a" and "b" to select whatever I want to keep. However, what to I type to save buffer c and resolve the conflict? It would be the next logic step but I just cannot find the correct key... At the moment I do "wc" and save it in place of the conflicted file and resolve the conflict manually in svn-staus (I use psvn). I hope somebody can help me out. I have read the quick help and a more extended version. Thanks, Rasmus