From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 Jun 2026 19:04:01 +0000 (-0700)
Subject: fixup! sequencer: be more careful with external merge
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5ca73edeb5528149440ba61e645478c15c71327;p=thirdparty%2Fgit.git

fixup! sequencer: be more careful with external merge
---

diff --git a/sequencer.c b/sequencer.c
index a85f9e8b77..7faf0093cb 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -2472,7 +2472,7 @@ static enum pick_result do_pick_commit(struct repository *r,
 					opts->xopts.nr, opts->xopts.v,
 					common, oid_to_hex(&head), remotes);
 		/*
-		 * If the there were conflicts, try_merge_command() returns 1,
+		 * If there were conflicts, try_merge_command() returns 1,
 		 * any other no-zero return code means that either the merge
 		 * command could not be run, or it failed to merge.
 		 */