* merging on NT
@ 2003-08-21 17:18 BITMEAD, David
0 siblings, 0 replies; only message in thread
From: BITMEAD, David @ 2003-08-21 17:18 UTC (permalink / 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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2003-08-21 17:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-08-21 17:18 merging on NT BITMEAD, David
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.