CVS commit: src/external/bsd/tmux

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Mon Jan  6 21:03:24 UTC 2020

Modified Files:
        src/external/bsd/tmux/dist: client.c cmd-attach-session.c
            cmd-display-message.c cmd-if-shell.c cmd-load-buffer.c
            cmd-new-session.c cmd-new-window.c cmd-parse.y cmd-queue.c
            cmd-send-keys.c cmd-show-options.c cmd-split-window.c
            cmd-wait-for.c colour.c environ.c format.c grid.c input-keys.c
            input.c job.c key-bindings.c menu.c mode-tree.c notify.c options.c
            paste.c regsub.c screen-write.c server-client.c server-fn.c
            session.c spawn.c status.c style.c tmux.1 tmux.c tmux.h tty-acs.c
            tty-keys.c tty-term.c tty.c utf8.c window-buffer.c window-client.c
            window-copy.c window-tree.c window.c
        src/external/bsd/tmux/usr.bin/tmux: Makefile
Removed Files:
        src/external/bsd/tmux/dist: TODO cmd-list.c cmd-parse.c cmd-set-hook.c
            cmd-string.c hooks.c
        src/external/bsd/tmux/dist/compat: fparseln.c

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/tmux/dist/TODO \
    src/external/bsd/tmux/dist/cmd-set-hook.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/tmux/dist/client.c \
    src/external/bsd/tmux/dist/cmd-send-keys.c \
    src/external/bsd/tmux/dist/colour.c src/external/bsd/tmux/dist/grid.c \
    src/external/bsd/tmux/dist/input-keys.c \
    src/external/bsd/tmux/dist/status.c src/external/bsd/tmux/dist/tty-acs.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/tmux/dist/cmd-attach-session.c \
    src/external/bsd/tmux/dist/cmd-new-session.c \
    src/external/bsd/tmux/dist/cmd-new-window.c \
    src/external/bsd/tmux/dist/cmd-wait-for.c \
    src/external/bsd/tmux/dist/server-client.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/tmux/dist/cmd-display-message.c \
    src/external/bsd/tmux/dist/cmd-if-shell.c \
    src/external/bsd/tmux/dist/environ.c src/external/bsd/tmux/dist/format.c \
    src/external/bsd/tmux/dist/options.c src/external/bsd/tmux/dist/tmux.c
cvs rdiff -u -r1.1.1.6 -r0 src/external/bsd/tmux/dist/cmd-list.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tmux/dist/cmd-load-buffer.c \
    src/external/bsd/tmux/dist/cmd-split-window.c \
    src/external/bsd/tmux/dist/key-bindings.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/tmux/dist/cmd-parse.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/tmux/dist/cmd-parse.y \
    src/external/bsd/tmux/dist/menu.c src/external/bsd/tmux/dist/regsub.c \
    src/external/bsd/tmux/dist/spawn.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/tmux/dist/cmd-queue.c \
    src/external/bsd/tmux/dist/mode-tree.c \
    src/external/bsd/tmux/dist/notify.c src/external/bsd/tmux/dist/paste.c \
    src/external/bsd/tmux/dist/window-buffer.c \
    src/external/bsd/tmux/dist/window-client.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/tmux/dist/cmd-show-options.c \
    src/external/bsd/tmux/dist/style.c
cvs rdiff -u -r1.10 -r0 src/external/bsd/tmux/dist/cmd-string.c
cvs rdiff -u -r1.4 -r0 src/external/bsd/tmux/dist/hooks.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/tmux/dist/input.c \
    src/external/bsd/tmux/dist/tty-keys.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/tmux/dist/job.c \
    src/external/bsd/tmux/dist/screen-write.c \
    src/external/bsd/tmux/dist/server-fn.c \
    src/external/bsd/tmux/dist/session.c src/external/bsd/tmux/dist/tmux.1 \
    src/external/bsd/tmux/dist/window-copy.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/tmux/dist/tmux.h
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/tmux/dist/tty-term.c \
    src/external/bsd/tmux/dist/window.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/tmux/dist/tty.c \
    src/external/bsd/tmux/dist/utf8.c \
    src/external/bsd/tmux/dist/window-tree.c
cvs rdiff -u -r1.2 -r0 src/external/bsd/tmux/dist/compat/fparseln.c
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/tmux/usr.bin/tmux/Makefile

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