| commit | 9938f30d13d20026dad2eed7a6b51de25768c858 | |
| author | Philippe Blain <levraiphilippeblain@gmail.com> | |
| Fri, 23 Jul 2021 12:14:27 +0000 (23 12:14 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 23 Jul 2021 22:45:33 +0000 (23 15:45 -0700) | ||
| tree | 590e54186532210d79321b7447cce98c856506f0 | treesnapshot (tar.gz zip) |
| parent | eb27b338a3e71c7c4079fbac8aeae3f8fbb5c687 | commitdiff |
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>
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>
| builtin/merge.c | diffblobblamehistory |