[Midnightbsd-cvs] src: contrib/diff: merge changes between 2.9 and 3.2

[laffer1 at midnightbsd.org]

Log Message:
-----------
merge changes between 2.9 and 3.2

Modified Files:
--------------
    src/contrib/diff/src:
        sdiff.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/contrib/diff/src/sdiff.c?r1=1.3&r2=1.4)

Removed Files:
-------------
    src/contrib/diff:
        .tarball-version
        (http://cvsweb.midnightbsd.org/src/contrib/diff/.tarball-version)
    src/contrib/diff/build-aux:
        arg-nonnull.h
        (http://cvsweb.midnightbsd.org/src/contrib/diff/build-aux/arg-nonnull.h)
        warn-on-use.h
        (http://cvsweb.midnightbsd.org/src/contrib/diff/build-aux/warn-on-use.h)
    src/contrib/diff/doc:
        diff.info
        (http://cvsweb.midnightbsd.org/src/contrib/diff/doc/diff.info)
        diff.texi
        (http://cvsweb.midnightbsd.org/src/contrib/diff/doc/diff.texi)
    src/contrib/diff/gnulib-tests:
        getdtablesize.c
        (http://cvsweb.midnightbsd.org/src/contrib/diff/gnulib-tests/getdtablesize.c)
        pathmax.h
        (http://cvsweb.midnightbsd.org/src/contrib/diff/gnulib-tests/pathmax.h)
        test-quotearg.c
        (http://cvsweb.midnightbsd.org/src/contrib/diff/gnulib-tests/test-quotearg.c)
        test-quotearg.sh
        (http://cvsweb.midnightbsd.org/src/contrib/diff/gnulib-tests/test-quotearg.sh)
        test-wctype.c
        (http://cvsweb.midnightbsd.org/src/contrib/diff/gnulib-tests/test-wctype.c)
    src/contrib/diff/gnulib-tests/locale/fr/LC_MESSAGES:
        test-quotearg.mo
        (http://cvsweb.midnightbsd.org/src/contrib/diff/gnulib-tests/locale/fr/LC_MESSAGES/test-quotearg.mo)
        test-quotearg.po
        (http://cvsweb.midnightbsd.org/src/contrib/diff/gnulib-tests/locale/fr/LC_MESSAGES/test-quotearg.po)
    src/contrib/diff/lib:
        mbrlen.c
        (http://cvsweb.midnightbsd.org/src/contrib/diff/lib/mbrlen.c)
        stdio-write.c
        (http://cvsweb.midnightbsd.org/src/contrib/diff/lib/stdio-write.c)
        timegm.c
        (http://cvsweb.midnightbsd.org/src/contrib/diff/lib/timegm.c)
        unitypes.h
        (http://cvsweb.midnightbsd.org/src/contrib/diff/lib/unitypes.h)
        uniwidth.h
        (http://cvsweb.midnightbsd.org/src/contrib/diff/lib/uniwidth.h)