From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: "BITMEAD, David" Newsgroups: gmane.emacs.help Subject: merging on NT Date: Thu, 21 Aug 2003 18:18:31 +0100 Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Message-ID: NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 7BIT X-Trace: sea.gmane.org 1061618583 5745 80.91.224.253 (23 Aug 2003 06:03:03 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 23 Aug 2003 06:03:03 +0000 (UTC) Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Sat Aug 23 08:03:01 2003 Return-path: Original-Received: from monty-python.gnu.org ([199.232.76.173]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 19qRUL-0000cN-00 for ; Sat, 23 Aug 2003 08:03:01 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.20) id 19qRFU-0004Aj-Kp for geh-help-gnu-emacs@m.gmane.org; Sat, 23 Aug 2003 01:47:40 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19qJ5W-0006eF-8z for help-gnu-emacs@gnu.org; Fri, 22 Aug 2003 17:04:50 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19ptXU-0007VB-Ok for help-gnu-emacs@gnu.org; Thu, 21 Aug 2003 13:48:33 -0400 Original-Received: from [134.32.26.55] (helo=mail.slb.com) by monty-python.gnu.org with esmtp (Exim 4.20) id 19pt6H-0006eC-GR for help-gnu-emacs@gnu.org; Thu, 21 Aug 2003 13:19:53 -0400 Original-Received: from conversion-daemon.eurmta01.london.eur.slb.com by eurmta01.london.eur.slb.com (iPlanet Messaging Server 5.2 HotFix 1.12 (built Feb 13 2003)) id <0HJZ00001BBFXC@eurmta01.london.eur.slb.com> for help-gnu-emacs@gnu.org; Thu, 21 Aug 2003 17:19:09 +0000 (GMT) Original-Received: from mailrelay2.sema.co.uk (mailrelay2.London.eur.slb.com [157.203.41.14]) by eurmta01.london.eur.slb.com (iPlanet Messaging Server 5.2 HotFix 1.12 (built Feb 13 2003)) with ESMTP id <0HJZ004R8C37WE@eurmta01.london.eur.slb.com> for help-gnu-emacs@gnu.org; Thu, 21 Aug 2003 17:18:43 +0000 (GMT) Original-Received: from lones1.sema.co.uk (lones1.London.eur.slb.com [157.203.40.186]) by mailrelay2.sema.co.uk (8.11.6+Sun/8.11.6) with ESMTP id h7LIGHY27567 for ; Thu, 21 Aug 2003 18:16:18 +0000 (GMT) Original-Received: by lones1.sema.co.uk with Internet Mail Service (5.5.2656.59) id ; Thu, 21 Aug 2003 18:18:27 +0100 Content-return: allowed Original-To: "'help-gnu-emacs@gnu.org'" X-Mailer: Internet Mail Service (5.5.2656.59) X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.2 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.help:12010 X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:12010 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