From mboxrd@z Thu Jan  1 00:00:00 1970
Path: main.gmane.org!not-for-mail
From: "Eli Zaretskii" <eliz@gnu.org>
Newsgroups: gmane.emacs.help
Subject: Re: Trying to merge two files with emacs... need help!
Date: Wed, 12 May 2004 22:42:42 +0200
Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org
Message-ID: <6654-Wed12May2004224241+0300-eliz@gnu.org>
References: <b0141914.0405111925.7f5756e1@posting.google.com>
	<mailman.4725.1084338189.1061.help-gnu-emacs@gnu.org>
	<b0141914.0405120350.e0bc4aa@posting.google.com>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: deer.gmane.org
X-Trace: sea.gmane.org 1084393433 12784 80.91.224.253 (12 May 2004 20:23:53 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Wed, 12 May 2004 20:23:53 +0000 (UTC)
Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Wed May 12 22:23:44 2004
Return-path: <help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org>
Original-Received: from monty-python.gnu.org ([199.232.76.173])
	by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BO0GV-0002To-00
	for <geh-help-gnu-emacs@m.gmane.org>; Wed, 12 May 2004 22:23:44 +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 1BO0DP-0000b4-Ey
	for geh-help-gnu-emacs@m.gmane.org; Wed, 12 May 2004 16:20:31 -0400
Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.34)
	id 1BO06y-0007nr-Nh
	for help-gnu-emacs@gnu.org; Wed, 12 May 2004 16:13:52 -0400
Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1BO05r-0007NV-1s
	for help-gnu-emacs@gnu.org; Wed, 12 May 2004 16:13:16 -0400
Original-Received: from [192.114.186.23] (helo=aragorn.inter.net.il)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1BO05Y-0007Bv-DU
	for help-gnu-emacs@gnu.org; Wed, 12 May 2004 16:12:24 -0400
Original-Received: from zaretski ([80.230.153.182])
	by aragorn.inter.net.il (MOS 3.4.6-GR) with ESMTP id CWD24690;
	Wed, 12 May 2004 22:43:33 +0300 (IDT)
Original-To: help-gnu-emacs@gnu.org
X-Mailer: emacs 21.3.50 (via feedmail 8 I) and Blat ver 1.8.9
In-reply-to: <b0141914.0405120350.e0bc4aa@posting.google.com>
	(gzimak@yahoo.com)
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 <help-gnu-emacs.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/help-gnu-emacs>,
	<mailto:help-gnu-emacs-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/help-gnu-emacs>
List-Post: <mailto:help-gnu-emacs@gnu.org>
List-Help: <mailto:help-gnu-emacs-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/help-gnu-emacs>,
	<mailto:help-gnu-emacs-request@gnu.org?subject=subscribe>
Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org
Xref: main.gmane.org gmane.emacs.help:18444
X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:18444

> From: gzimak@yahoo.com (Gary Z)
> Newsgroups: gnu.emacs.help
> Date: 12 May 2004 04:50:45 -0700
> 
> It actually was a typo, but not the one you suggested. I'm chosing
> "Compare Two files" from the menu. I was trying not to use Merge,
> since I wanted more control over how conflicts are handled. Am I going
> about it the wrong way?

I think you need to select "Merge" and then "Files".  You will have
full control on how conflicts are handled.