From bdb8f7da3a924d4dcf31803c8c18d932bf1e9db5 Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Sat, 15 Mar 2025 11:12:18 -0700 Subject: [PATCH] completion/tmux: quick fixup to conflict resolution in b85e405 Delete a line that should have been replaced with the following line (with --keep-order) Closes #11288 --- share/completions/tmux.fish | 1 - 1 file changed, 1 deletion(-) diff --git a/share/completions/tmux.fish b/share/completions/tmux.fish index a1dfaf7f9..114d047d8 100644 --- a/share/completions/tmux.fish +++ b/share/completions/tmux.fish @@ -401,7 +401,6 @@ complete -c tmux -n "__fish_seen_subcommand_from $send" -s R -d 'reset terminal complete -c tmux -n "__fish_seen_subcommand_from $send" -s X -d 'copy mode command' complete -c tmux -n "__fish_seen_subcommand_from $send" -s l -d 'literal chars' complete -c tmux -n "__fish_seen_subcommand_from $send" -s H -d 'hex-encoded chars' -complete -c tmux -n "__fish_seen_subcommand_from $send" -xs t -a '(__fish_tmux_panes)' -d 'target pane' complete -c tmux -n "__fish_seen_subcommand_from $send" -xs t --keep-order -a '(__fish_tmux_panes)' -d 'target pane' complete -c tmux -n __fish_use_subcommand -a $sendprefix -d 'send the prefix key'