From mboxrd@z Thu Jan  1 00:00:00 1970
Path: main.gmane.org!not-for-mail
From: gzimak@yahoo.com (Gary Z)
Newsgroups: gmane.emacs.help
Subject: Re: Trying to merge two files with emacs... need help!
Date: 12 May 2004 04:50:45 -0700
Organization: http://groups.google.com
Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org
Message-ID: <b0141914.0405120350.e0bc4aa@posting.google.com>
References: <b0141914.0405111925.7f5756e1@posting.google.com>
	<mailman.4725.1084338189.1061.help-gnu-emacs@gnu.org>
NNTP-Posting-Host: deer.gmane.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
X-Trace: sea.gmane.org 1084370590 10335 80.91.224.253 (12 May 2004 14:03:10 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Wed, 12 May 2004 14:03:10 +0000 (UTC)
Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Wed May 12 16:03:00 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 1BNuK3-0003tf-00
	for <geh-help-gnu-emacs@m.gmane.org>; Wed, 12 May 2004 16:02:59 +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 1BNsQp-0008IP-UT
	for geh-help-gnu-emacs@m.gmane.org; Wed, 12 May 2004 08:01:52 -0400
Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!postnews1.google.com!not-for-mail
Original-Newsgroups: gnu.emacs.help
Original-Lines: 19
Original-NNTP-Posting-Host: 20.7.100.30
Original-X-Trace: posting.google.com 1084362646 9519 127.0.0.1 (12 May 2004 11:50:46
	GMT)
Original-X-Complaints-To: groups-abuse@google.com
Original-NNTP-Posting-Date: Wed, 12 May 2004 11:50:46 +0000 (UTC)
Original-Xref: shelby.stanford.edu gnu.emacs.help:123147
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 <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:18439
X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:18439

Eli Zaretskii <eliz@gnu.org> wrote in message news:<mailman.4725.1084338189.1061.help-gnu-emacs@gnu.org>...
> > From: gzimak@yahoo.com (Gary Z)
> > Newsgroups: gnu.emacs.help
> > Date: 11 May 2004 20:25:04 -0700
> > 
> > I'm new to emacs and I'm trying to use it to merge two files into one.
> > Some time ago, I watched a co-worker step through a file and
> > selectively merge changes into it from another file. Unfortunately, I
> > don't recall how he did it! Currently, I'm opening a file with emacs,
> > selecting diff (2 files) from the menu, specifying the current file
> > and the file I want to merge into the current file.
> 
> I hope that was a typo, and you actually meant to say that you select
> "Merge" from the menu bar, not "Diff".

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?