Module Name: src
Committed By: christos
Date: Sat Jan 5 21:44:40 UTC 2019
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-send-keys.c
cmd-split-window.c format.c grid.c hooks.c input.c job.c
key-bindings.c mode-tree.c notify.c screen-write.c screen.c
server-client.c server-fn.c session.c status.c tmux.1 tmux.c tmux.h
tty-keys.c tty-term.c tty.c window-buffer.c window-client.c
window-copy.c window-tree.c window.c
src/external/bsd/tmux/dist/compat: imsg-buffer.c imsg.c
src/external/bsd/tmux/usr.bin/tmux: Makefile
Log Message:
resolve conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/tmux/dist/client.c \
src/external/bsd/tmux/dist/cmd-send-keys.c \
src/external/bsd/tmux/dist/grid.c src/external/bsd/tmux/dist/status.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/tmux/dist/cmd-attach-session.c \
src/external/bsd/tmux/dist/cmd-new-session.c \
src/external/bsd/tmux/dist/server-client.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tmux/dist/cmd-display-message.c \
src/external/bsd/tmux/dist/cmd-if-shell.c \
src/external/bsd/tmux/dist/format.c src/external/bsd/tmux/dist/tmux.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/tmux/dist/cmd-load-buffer.c \
src/external/bsd/tmux/dist/cmd-new-window.c \
src/external/bsd/tmux/dist/cmd-split-window.c \
src/external/bsd/tmux/dist/key-bindings.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/tmux/dist/hooks.c \
src/external/bsd/tmux/dist/notify.c src/external/bsd/tmux/dist/tty.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/tmux/dist/input.c
cvs rdiff -u -r1.8 -r1.9 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.2 -r1.3 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/window-tree.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/tmux/dist/tmux.h
cvs rdiff -u -r1.9 -r1.10 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.8 -r1.9 src/external/bsd/tmux/dist/compat/imsg-buffer.c \
src/external/bsd/tmux/dist/compat/imsg.c
cvs rdiff -u -r1.20 -r1.21 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.
