From f8e908b89c100e736bdf3dc13c5f490edd5ad97a Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Tue, 19 May 2026 13:26:27 +0100
Subject: [PATCH] More trivial merge errors.

---
 server-fn.c | 3 +--
 tmux.1      | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server-fn.c b/server-fn.c
index bf5a91fc..16cda756 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -340,8 +340,7 @@ server_destroy_pane(struct window_pane *wp, int notify)
 	case 0:
 		break;
 	case 2:
-		if (remain_on_exit == 2 &&
-		    WIFEXITED(wp->status) && WEXITSTATUS(wp->status) == 0)
+		if (WIFEXITED(wp->status) && WEXITSTATUS(wp->status) == 0)
 			break;
 		/* FALLTHROUGH */
 	case 1:
diff --git a/tmux.1 b/tmux.1
index b22a305c..1820935e 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3448,6 +3448,7 @@ $ make 2>&1|tmux splitw \-dI &
 .Pp
 All other options have the same meaning as for the
 .Ic new\-window
+command.
 .Tg nextl
 .It Ic next\-layout Op Fl t Ar target\-window
 .D1 Pq alias: Ic nextl