unofficial mirror of help-gnu-emacs@gnu.org
 help / color / mirror / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
Subject: Re: Trying to merge two files with emacs... need help!
Date: 12 May 2004 08:00:20 +0200	[thread overview]
Message-ID: <uwu3i18y3.fsf@gnu.org> (raw)
In-Reply-To: <b0141914.0405111925.7f5756e1@posting.google.com> (gzimak@yahoo.com)

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

  reply	other threads:[~2004-05-12  6:00 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-05-12  3:25 Trying to merge two files with emacs... need help! Gary Z
2004-05-12  6:00 ` Eli Zaretskii [this message]
     [not found] ` <mailman.4725.1084338189.1061.help-gnu-emacs@gnu.org>
2004-05-12 11:50   ` Gary Z
2004-05-12 20:42     ` Eli Zaretskii
2004-05-12 20:44     ` LEE Sau Dan
2004-05-12 12:21 ` Kevin Dziulko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=uwu3i18y3.fsf@gnu.org \
    --to=eliz@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).