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

In future, it should be as easy as "update -j ....", but this time I had to
go over it by hand.  Not nice..

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

..

analyze.c

Import GNU diffutils 2.7

1995-10-28 18:51:33 +00:00

cmpbuf.c

Import GNU diffutils 2.7

1995-10-28 18:51:33 +00:00

cmpbuf.h

Import GNU diffutils 2.7

1995-10-28 18:51:33 +00:00

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

Import GNU diffutils 2.7

1995-10-28 18:51:33 +00:00

diff3.c

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

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

diff.1

…

diff.c

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

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

diff.h

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

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

dir.c

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

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

ed.c

Import GNU diffutils 2.7

1995-10-28 18:51:33 +00:00

fnmatch.h

Import GNU diffutils 2.7

1995-10-28 18:51:33 +00:00

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

…

NEWS

Import GNU diffutils 2.7

1995-10-28 18:51:33 +00:00

normal.c

Import GNU diffutils 2.7

1995-10-28 18:51:33 +00:00

regex.c

…

regex.h

…

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

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

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

version.c

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

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

xmalloc.c

Import GNU diffutils 2.7

1995-10-28 18:51:33 +00:00