merge: add missing word "strategy" to a message

The variable 'best_strategy' holds the name of the merge strategy that
resulted in fewer conflicts, if several strategies were tried. When
that's the case but the best strategy was not the first one tried, we
inform the user which strategy was the "best" one before recreating the
merge and leaving the conflicted files in the tree.

This informational message is missing the word "strategy", so it shows
something like:

    Using the recursive to prepare resolving by hand.

Fix that.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/merge.c b/builtin/merge.c
index a8a843b1f541134b59f465cb7d6d9acd1faf9525..74797b6c7a63aa896603e0670a375c5ae06ff0a3 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1715,7 +1715,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
        else {
                printf(_("Rewinding the tree to pristine...\n"));
                restore_state(&head_commit->object.oid, &stash);
-               printf(_("Using the %s to prepare resolving by hand.\n"),
+               printf(_("Using the %s strategy to prepare resolving by hand.\n"),
                        best_strategy);
                try_merge_strategy(best_strategy, common, remoteheads,
                                   head_commit);