CVS commit: othersrc/usr.bin/tnftp/libedit

[Luke Mewburn <lukem%netbsd.org@localhost>]

Module Name:    othersrc
Committed By:   lukem
Date:           Tue May 31 02:07:02 UTC 2005

Modified Files:
        othersrc/usr.bin/tnftp/libedit: editline.3 histedit.h parse.c parse.h
            read.c readline.c term.h tty.c vi.c
        othersrc/usr.bin/tnftp/libedit/readline: readline.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 othersrc/usr.bin/tnftp/libedit/editline.3 \
    othersrc/usr.bin/tnftp/libedit/histedit.h \
    othersrc/usr.bin/tnftp/libedit/parse.h \
    othersrc/usr.bin/tnftp/libedit/readline.c \
    othersrc/usr.bin/tnftp/libedit/term.h
cvs rdiff -r1.4 -r1.5 othersrc/usr.bin/tnftp/libedit/parse.c \
    othersrc/usr.bin/tnftp/libedit/read.c \
    othersrc/usr.bin/tnftp/libedit/tty.c othersrc/usr.bin/tnftp/libedit/vi.c
cvs rdiff -r1.2 -r1.3 othersrc/usr.bin/tnftp/libedit/readline/readline.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.