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 <dstolee@microsoft.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 4, 2021 at 23:50 UTC
81483fe613de70e17913167876676528cb37cbcd
2 files changed
+2
-2
builtin/merge.c
+1
-1
@@ -738,7 +738,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
738
739
for (x = 0; x < xopts_nr; x++)
740
if (parse_merge_opt(&o, xopts[x]))
741
- die(_("Unknown option for merge-recursive: -X%s"), xopts[x]);
741
+ die(_("unknown strategy option: -X%s"), xopts[x]);
742
743
o.branch1 = head_arg;
744
o.branch2 = merge_remote_util(remoteheads->item)->name;
sequencer.c
+1
-1
@@ -2065,7 +2065,7 @@ static int do_pick_commit(struct repository *r,
2065
/*
2066
* We do not intend to commit immediately. We just want to
2067
* merge the differences in, so let's compute the tree
2068
- * that represents the "current" state for merge-recursive
2068
+ * that represents the "current" state for the merge machinery
2069
* to work on.
2070
*/
2071
if (write_index_as_tree(&head, r->index, r->index_file, 0, NULL))