fixup! sequencer: be more careful with external merge

diff --git a/sequencer.c b/sequencer.c
index a85f9e8b77d2c3ce5c7aca791ecf0357ebb250c9..7faf0093cb0f885f74558b9576d576303823575a 100644 (file)
--- 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.
                 */