From: A Large Angry SCM Date: Fri, 18 Nov 2005 04:40:03 GMT Subject: Re: master has some toys Message-ID: <437D5B23.1070708@gmail.com> In-Reply-To: <7v7jb6r35s.fsf@assigned-by-dhcp.cox.net> Junio C Hamano wrote: > John Benes writes: > >>diff --git a/file4 b/file4 >>index >>edc575dec543a684da5007b43886ee32ecb381ae..adb07b7ad3fa2c63251b06d1d39cb90a >>85b860b4 100644 >>Files a/file4 and b/file4 differ > > Thanks. This is the same problem as what Large Angly SCM > reports. What does your "diff --version" say? > diff --version diff (GNU diffutils) 2.8.7 Written by Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, and Len Tower. Copyright (C) 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. >