Subject: [PATCH 3/3] advice: translate all actions in error_resolve_conflict()

From: Oswald Buddenhagen <[email-masked]>
Date: Thu, 23 Mar 2023 17:22:34 +0100

action_name() returns a N_()'d string (for good reasons), so we still
need to _() it.

In practice, this affects 'rebase'.

Whether this is actually useful is debatable ...

Signed-off-by: Oswald Buddenhagen <[email-masked]>
---
 advice.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/advice.c b/advice.c
index d6232439c3..f75f3df582 100644
--- a/advice.c
+++ b/advice.c
@@ -192,7 +192,7 @@ int error_resolve_conflict(const char *me)
 		error(_("Reverting is not possible because you have unmerged files."));
 	else
 		error(_("It is not possible to %s because you have unmerged files."),
-			me);
+			_(me));
 
 	if (advice_enabled(ADVICE_RESOLVE_CONFLICT))
 		/*
-- 
2.40.0.152.g15d061e6df