[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: CVS/Diff merge defect. (fwd)

From: Paul Eggert
Subject: Re: CVS/Diff merge defect. (fwd)
Date: Tue, 12 Mar 2002 23:59:45 -0800 (PST)

This message follows up on an old Diff bug report by Kevin Pearson
and proposed patch by Karl Tomlinson

> Date: Tue, 15 Aug 2000 16:33:50 +1200
> From: Karl Tomlinson <k.tomlinson@auckland.ac.nz>
> I include patches for version 2.7 of diffutils to use OLDFILE as the
> common file when a merge or edscript is requested of diff3.  I think the
> --inhibit-hunk-merge option of 2.7.2 is no longer required.

Thanks for the analysis and patch.  I fixed the problem in a somewhat
different way, and you can see the result in the latest test version
of GNU diffutils, in:


(The fix has actually been present since diffutils test version 2.7.3
 in November, but I forgot to drop you a line then.)

> I can submit patches for cvs also but I'll wait to see if there is
> feedback on this.

Sorry about the late feedback, and thanks again for the fix.  (Also
thanks to Jim Meyering who kept bugging me to release a fixed version
of diffutils.  :-)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]