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: 12 May 2004 08:00:20 +0200
Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org
Message-ID: <uwu3i18y3.fsf@gnu.org>
References: <b0141914.0405111925.7f5756e1@posting.google.com>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: deer.gmane.org
X-Trace: sea.gmane.org 1084338260 1436 80.91.224.253 (12 May 2004 05:04:20 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Wed, 12 May 2004 05:04:20 +0000 (UTC)
Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Wed May 12 07:04:15 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 1BNluh-0008C8-00
	for <geh-help-gnu-emacs@m.gmane.org>; Wed, 12 May 2004 07:04: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 1BNlty-0005eh-DE
	for geh-help-gnu-emacs@m.gmane.org; Wed, 12 May 2004 01:03:30 -0400
Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.34)
	id 1BNltA-0005Lg-Lk
	for help-gnu-emacs@gnu.org; Wed, 12 May 2004 01:02:40 -0400
Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1BNlpE-0003l1-EO
	for help-gnu-emacs@gnu.org; Wed, 12 May 2004 00:59:10 -0400
Original-Received: from [207.232.27.5] (helo=WST0054)
	by monty-python.gnu.org with asmtp (Exim 4.34) id 1BNlot-0003YE-QI
	for help-gnu-emacs@gnu.org; Wed, 12 May 2004 00:58:16 -0400
Original-To: help-gnu-emacs@gnu.org
In-reply-to: <b0141914.0405111925.7f5756e1@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:18430
X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:18430

> 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".