From: "BITMEAD, David" <David.BITMEAD@london.sema.slb.com>
Subject: merging on NT
Date: Thu, 21 Aug 2003 18:18:31 +0100 [thread overview]
Message-ID: <EB7B6BA1098DD611BA0A00A0C9B2296601C6DB@LONES8> (raw)
Hello,
I have just installed emacs (version 20.7.1) on my NT (version 4) machine
and was hoping to be able to use the merge utility (Tools->merge->buffers)
to merge some parallel code versions.
However, I get the following error after using the 'next diff' command 3 or
four times:
/rootmg2/nccygwin/usr/local/bin/diff3.exe: unrecognized option `--binary'
/rootmg2/nccygwin/usr/local/bin/diff3.exe: Try
`/rootmg2/nccygwin/usr/local/bin/diff3.exe --help' for more information.
The version of diff I have installed is:
F:\>diff --version
diff - GNU diffutils version 2.7
The version of diff3 I have installed is:
F:\>diff3 --version
diff3 - GNU diffutils version 2.7
Any ideas what I should try to do to get this working?
Ta,
Dave
reply other threads:[~2003-08-21 17:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=EB7B6BA1098DD611BA0A00A0C9B2296601C6DB@LONES8 \
--to=david.bitmead@london.sema.slb.com \
/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).