Change #286552

Category	None
Changed by	Nicholas Marriott <nicholas.marriottohnoyoudont@gmail.com>
Changed at	Fri 16 Oct 2026 17:11:10
Repository	https://api.github.com/repos/tmux/tmux
Project	tmux/tmux
Branch	image_merge
Revision	ccda0e52d2ca077ef9f7854f483821a7ba73867e

Comments

Merge branch 'master' into image_merge

# Conflicts:
#	format.c
#	image-grid.c
#	image.c
#	options-table.c
#	server-client.c
#	tmux.1
#	tmux.h

Changed files

cmd-display-menu.c
cmd-join-pane.c
cmd-resize-pane.c
cmd-split-window.c
cmd.c
format-draw.c
format.c
image-grid.c
image.c
input.c
key-bindings.c
menu.c
mode-tree.c
options-table.c
options.c
regress/copy-mode-search-mark-end-of-line.sh
regress/floating-pane-new-zoom.sh
regress/format-list-default.sh
regress/format-list-empty.sh
regress/image-sixel-limits.sh
regress/input-lines-region.sh
regress/side-status-clamp.sh
regress/side-status-click.sh
regress/side-status-drag.sh
regress/side-status-format.sh
regress/side-status-image.sh
regress/side-status-margins.sh
regress/side-status-mouse.sh
regress/side-status-off-redraw.sh
regress/side-status-pane-drag.sh
regress/side-status-prompt.sh
regress/side-status-refresh.sh
regress/side-status-resize.sh
regress/side-status-results/side-left-floating.result
regress/side-status-results/side-left.result
regress/side-status-results/side-off.result
regress/side-status-results/side-right-narrow.result
regress/side-status-results/side-right-status.result
regress/side-status-results/side-right.result
regress/side-status-results/side-sessions.result
regress/side-status-scroll.sh
regress/side-status-style.sh
regress/side-status.sh
regress/status-ignore-size.sh
regress/status-menu.sh
regress/tty-clamp.sh
regress/tty-keys-colours-redraw.sh
resize.c
screen-redraw.c
screen-write.c
server-client.c
status.c
style.c
tmux-image.h
tmux.1
tmux.h
tty.c
window.c