From: Alex Henrie <alexhenrie24@gmail.com>
Date: Sat, 15 May 2021 20:01:11 +0000 (-0600)
Subject: merge: don't translate literal commands
X-Git-Tag: v2.33.0-rc0~129^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a30e43f61a1e614309875ab7775f2274b4e40742;p=thirdparty%2Fgit.git

merge: don't translate literal commands

These strings have not been modified in any translation, nor should they
be.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/merge.c b/builtin/merge.c
index 388619536a..2d3424cecc 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -56,8 +56,8 @@ struct strategy {
 
 static const char * const builtin_merge_usage[] = {
 	N_("git merge [<options>] [<commit>...]"),
-	N_("git merge --abort"),
-	N_("git merge --continue"),
+	"git merge --abort",
+	"git merge --continue",
 	NULL
 };