Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-11-15 12:01:18 +00:00
2 changed files with 6 additions and 1 deletions

1
tmux.1
View File

@ -1036,6 +1036,7 @@ The following commands are supported in copy mode:
.It Li "copy-end-of-line" Ta "D" Ta "C-k"
.It Li "copy-line" Ta "" Ta ""
.It Li "copy-pipe <command>" Ta "" Ta ""
.It Li "copy-pipe-and-cancel <command>" Ta "" Ta ""
.It Li "copy-selection" Ta "" Ta ""
.It Li "copy-selection-and-cancel" Ta "Enter" Ta "M-w"
.It Li "cursor-down" Ta "j" Ta "Down"