From: "Eli Zaretskii" <eliz@gnu.org>
Subject: Re: Trying to merge two files with emacs... need help!
Date: Wed, 12 May 2004 22:42:42 +0200 [thread overview]
Message-ID: <6654-Wed12May2004224241+0300-eliz@gnu.org> (raw)
In-Reply-To: <b0141914.0405120350.e0bc4aa@posting.google.com> (gzimak@yahoo.com)
> 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.
next prev parent reply other threads:[~2004-05-12 20:42 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
[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 [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6654-Wed12May2004224241+0300-eliz@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.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.