Merge branch 'km/log-usage-string-i18n'

* km/log-usage-string-i18n: log.c: fix translation markings
git-mirror · Jan 14, 2015 · e9f9119 · e9f9119
2 parents 2202ab1 + e66dc0c
commit e9f9119
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/builtin/log.c b/builtin/log.c
@@ -38,8 +38,8 @@ static const char *fmt_patch_subject_prefix = "PATCH";
 static const char *fmt_pretty;
 
 static const char * const builtin_log_usage[] = {
-	N_("git log [<options>] [<revision range>] [[--] <path>...]\n")
-	N_("   or: git show [options] <object>..."),
+	N_("git log [<options>] [<revision range>] [[--] <path>...]"),
+	N_("git show [options] <object>..."),
 	NULL
 };