CVS commit: src/external/bsd/tmux/dist

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

Module Name:    src
Committed By:   christos
Date:           Tue Nov 12 21:02:28 UTC 2019

Modified Files:
        src/external/bsd/tmux/dist: client.c cmd-attach-session.c
            cmd-capture-pane.c cmd-display-message.c cmd-if-shell.c
            cmd-load-buffer.c cmd-new-session.c cmd-queue.c cmd-send-keys.c
            cmd-show-messages.c cmd-show-options.c cmd-split-window.c
            cmd-string.c cmd-wait-for.c colour.c environ.c format.c grid.c
            input-keys.c input.c job.c key-bindings.c mode-tree.c options.c
            screen-write.c screen.c server-client.c server-fn.c session.c
            status.c style.c tmux.1 tmux.c tmux.h tty-keys.c tty-term.c tty.c
            utf8.c window-buffer.c window-client.c window-copy.c window-tree.c
            window.c xmalloc.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/tmux/dist/cmd-attach-session.c \
    src/external/bsd/tmux/dist/cmd-new-session.c \
    src/external/bsd/tmux/dist/cmd-wait-for.c \
    src/external/bsd/tmux/dist/server-client.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/tmux/dist/cmd-capture-pane.c \
    src/external/bsd/tmux/dist/cmd-load-buffer.c \
    src/external/bsd/tmux/dist/cmd-show-messages.c \
    src/external/bsd/tmux/dist/cmd-split-window.c \
    src/external/bsd/tmux/dist/key-bindings.c
cvs rdiff -u -r1.8 -r1.9 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.3 -r1.4 src/external/bsd/tmux/dist/cmd-queue.c \
    src/external/bsd/tmux/dist/mode-tree.c \
    src/external/bsd/tmux/dist/window-buffer.c \
    src/external/bsd/tmux/dist/window-client.c \
    src/external/bsd/tmux/dist/xmalloc.h
cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/tmux/dist/cmd-show-options.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/tmux/dist/cmd-string.c \
    src/external/bsd/tmux/dist/job.c \
    src/external/bsd/tmux/dist/screen-write.c \
    src/external/bsd/tmux/dist/screen.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.11 -r1.12 src/external/bsd/tmux/dist/input.c
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/tmux/dist/style.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/tmux/dist/tmux.h
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/tmux/dist/tty-keys.c \
    src/external/bsd/tmux/dist/tty-term.c src/external/bsd/tmux/dist/window.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/tmux/dist/tty.c \
    src/external/bsd/tmux/dist/utf8.c \
    src/external/bsd/tmux/dist/window-tree.c

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