Re: [PATCH 10/10] Update error message and code comment

On Tue, Aug 3, 2021 at 5:05 PM Johannes Schindelin
[off-list ref] wrote:

Hi Elijah,

On Tue, 3 Aug 2021, Elijah Newren via GitGitGadget wrote:

quoted

From: Elijah Newren <redacted>

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.

Signed-off-by: Elijah Newren <redacted>
---
 builtin/merge.c | 2 +-
 sequencer.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/merge.c b/builtin/merge.c
index a8a843b1f54..24b62a9c532 100644
--- 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]);

Since we updated our rules to start `die()` messages with a lower-case
letter, we could sneak in this change here, too. That would save
translators one extra round.

Sure, will do.