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 388619536aa1d250d6cad275b67974bbfdca28e4..2d3424cecc9157d389a463a7a7c7953710607c03 100644 (file)
--- 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
 };