From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: LEE Sau Dan Newsgroups: gmane.emacs.help Subject: Re: Trying to merge two files with emacs... need help! Date: 12 May 2004 22:44:42 +0200 Organization: Rechenzentrum der Universitaet Freiburg, Germany Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Message-ID: References: NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-7 X-Trace: sea.gmane.org 1084446084 9671 80.91.224.253 (13 May 2004 11:01:24 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 13 May 2004 11:01:24 +0000 (UTC) Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Thu May 13 13:01:15 2004 Return-path: Original-Received: from monty-python.gnu.org ([199.232.76.173]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1BODxj-00037E-00 for ; Thu, 13 May 2004 13:01:15 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1BODlX-00024Q-CY for geh-help-gnu-emacs@m.gmane.org; Thu, 13 May 2004 06:48:39 -0400 Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!newsmi-us.news.garr.it!newsmi-eu.news.garr.it!NewsITBone-GARR!feed.news.tiscali.de!news.belwue.de!news.uni-freiburg.de!not-for-mail Original-Newsgroups: gnu.emacs.help Original-Lines: 20 Original-NNTP-Posting-Host: savona.informatik.uni-freiburg.de User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2 Original-Xref: shelby.stanford.edu gnu.emacs.help:123162 Original-To: help-gnu-emacs@gnu.org X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.4 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.help:18454 X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:18454 >>>>> "Gary" == Gary Z writes: Gary> It actually was a typo, but not the one you suggested. I'm Gary> chosing "Compare Two files" from the menu. I was trying not Gary> to use Merge, since I wanted more control over how conflicts Gary> are handled. Am I going about it the wrong way? So, type M-x ediff-merge-files RET Follow the prompts. In the command window (very small), type '?' for an elaborate help screen. A little bit experimenting with the commands listed in the help screen should be enough to discover how to do things. -- Lee Sau Dan +Z05biGVm- ~{@nJX6X~} E-mail: danlee@informatik.uni-freiburg.de Home page: http://www.informatik.uni-freiburg.de/~danlee