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>

diff --git a/builtin/merge.c b/builtin/merge.c
index a8a843b1f541134b59f465cb7d6d9acd1faf9525..d7b14bf4a7f3148049d688f1c95f4b000b5cf89c 100644 (file)
--- 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 7f07cd00f3f20ab3dc0c508653ac28bdd8e8b8c1..a4e5c43fcf2e005fcdcc61ec164d5c51cc5d7da2 100644 (file)
--- 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))