Merge branch 'ah/merge-usage-i18n-fix'

i18n update. * ah/merge-usage-i18n-fix: merge: don't translate literal commands
4 years ago · b03709eae7
1 changed files with 2 additions and 2 deletions
--- a/builtin/merge.c
+++ b/builtin/merge.c
@ -56,8 +56,8 @@ struct strategy {
				@@ -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
 };