interdiff (was Re: [m-dev.] for review: --use-local-vars)

[David Overton]

On Tue, Apr 24, 2001 at 08:06:27PM +1000, Tyson Dowd wrote:
> On 24-Apr-2001, Zoltan Somogyi <zs at cs.mu.OZ.AU> wrote:
> > On 23-Apr-2001, Tyson Dowd <trd at cs.mu.OZ.AU> wrote:
> > > I think you should try using interdiff with the -h option, which
> > > generates diffs that are intended for human viewing (although in this
> > > particular change it doesn't make much difference to readability).
> > 
> > Is there a man page or info page for interdiff? I couldn't find one.
> 
> Not as far as I know.  I just read the source code at some point.

There is a short man page included in the Debian interdiff package
(currently only available in 'testing' and 'unstable').  Here it is:

------------------------------------------------------------------------

INTERDIFF(1)              User's Manual              INTERDIFF(1)

NAME
       interdiff  -  show  differences  between  two unified diff
       files

SYNOPSIS
       interdiff [-h] [-p n] diff1 diff2

DESCRIPTION
       interdiff creates a unified diff that expresses  the  dif-
       ference  between  two  unified diffs (patches created with
       the -u option to diff).  The diffs must both  be  relative
       to  the same files.  For best results, the diffs must have
       at least three lines of context.

OPTIONS
       -h     Create the interdiff as a human-readable diff,  one
              which   includes  the  default  amount  of  context
              profided by the diff program with the -u option  (3
              lines).  Without this option, creates a contextless
              unified diff to avoid clashes between diffs.

       -p n   When comparing filenames, ignore the first n  path-
              name components from both patches.

BUGS
       interdiff is not 100% reliable, but it could be made so.

AUTHOR
       Tim Waugh <twaugh at redhat.com>
       Man page by Michael K. Johnson <johnsonm at redhat.com>

Linux                       2 Aug 2000                          1

------------------------------------------------------------------------

-- 
David Overton      Department of Computer Science & Software Engineering
PhD Student        The University of Melbourne, Victoria 3010, Australia
+61 3 8344 9159    http://www.cs.mu.oz.au/~dmo
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------