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>
Philippe Blain committed
Jul 23, 2021 at 12:14 UTC
9938f30d13d20026dad2eed7a6b51de25768c858
1 file changed
+1
-1
builtin/merge.c
+1
-1
@@ -1715,7 +1715,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
1715
else {
1716
printf(_("Rewinding the tree to pristine...\n"));
1717
restore_state(&head_commit->object.oid, &stash);
1718
- printf(_("Using the %s to prepare resolving by hand.\n"),
1718
+ printf(_("Using the %s strategy to prepare resolving by hand.\n"),
1719
best_strategy);
1720
try_merge_strategy(best_strategy, common, remoteheads,
1721
head_commit);