Peter Wemm fce15c9ab3 Revert $FreeBSD$ to $Id$

1997-02-22 15:48:31 +00:00

..

doc

Revert $FreeBSD$ to $Id$

1997-02-22 15:48:31 +00:00

analyze.c

…

cmpbuf.c

…

cmpbuf.h

…

config.h

Merge in/out comflicts caused by Diffutils-2.7 import...

1995-10-28 19:11:01 +00:00

context.c

Merge in/out comflicts caused by Diffutils-2.7 import...

1995-10-28 19:11:01 +00:00

COPYING

…

diff3.c

Merge in/out comflicts caused by Diffutils-2.7 import...

1995-10-28 19:11:01 +00:00

diff.1

There's no -p flag to our diff.

1996-05-26 22:27:52 +00:00

diff.c

Pick collate info fo ranges

1996-08-20 14:22:57 +00:00

diff.h

Merge in/out comflicts caused by Diffutils-2.7 import...

1995-10-28 19:11:01 +00:00

diff.texi

Import diff-2.7's diff.texi which I left out last time.

1995-10-29 08:52:27 +00:00

dir.c

Merge in/out comflicts caused by Diffutils-2.7 import...

1995-10-28 19:11:01 +00:00

ed.c

…

getopt1.c

Merge in/out comflicts caused by Diffutils-2.7 import...

1995-10-28 19:11:01 +00:00

getopt.c

Merge in/out comflicts caused by Diffutils-2.7 import...

1995-10-28 19:11:01 +00:00

getopt.h

…

ifdef.c

Merge in/out comflicts caused by Diffutils-2.7 import...

1995-10-28 19:11:01 +00:00

io.c

Merge in/out comflicts caused by Diffutils-2.7 import...

1995-10-28 19:11:01 +00:00

Makefile

Revert $FreeBSD$ to $Id$

1997-02-22 15:48:31 +00:00

NEWS

…

normal.c

…

sdiff.c

Merge in/out comflicts caused by Diffutils-2.7 import...

1995-10-28 19:11:01 +00:00

side.c

Merge in/out comflicts caused by Diffutils-2.7 import...

1995-10-28 19:11:01 +00:00

system.h

Merge in/out comflicts caused by Diffutils-2.7 import...

1995-10-28 19:11:01 +00:00

util.c

Correct the path used to invoke "pr" if the "-l" option to diff is

1996-01-10 10:41:47 +00:00

version.c

Merge in/out comflicts caused by Diffutils-2.7 import...

1995-10-28 19:11:01 +00:00

xmalloc.c

…