From 81483fe613de70e17913167876676528cb37cbcd Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Wed, 4 Aug 2021 23:50:54 +0000 Subject: [PATCH] Update error message and code comment There were two locations in the code that referred to 'merge-recursive' but which were also applicable to 'merge-ort'. Update them to more general wording. Acked-by: Derrick Stolee Acked-by: Johannes Schindelin Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- builtin/merge.c | 2 +- sequencer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index a8a843b1f5..d7b14bf4a7 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -738,7 +738,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, for (x = 0; x < xopts_nr; x++) if (parse_merge_opt(&o, xopts[x])) - die(_("Unknown option for merge-recursive: -X%s"), xopts[x]); + die(_("unknown strategy option: -X%s"), xopts[x]); o.branch1 = head_arg; o.branch2 = merge_remote_util(remoteheads->item)->name; diff --git a/sequencer.c b/sequencer.c index 7f07cd00f3..a4e5c43fcf 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2065,7 +2065,7 @@ static int do_pick_commit(struct repository *r, /* * We do not intend to commit immediately. We just want to * merge the differences in, so let's compute the tree - * that represents the "current" state for merge-recursive + * that represents the "current" state for the merge machinery * to work on. */ if (write_index_as_tree(&head, r->index, r->index_file, 0, NULL)) -- 2.11.4.GIT