Merge branch 'km/log-usage-string-i18n'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2015 20:32:39 +0000 (12:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2015 20:32:39 +0000 (12:32 -0800)
* km/log-usage-string-i18n:
  log.c: fix translation markings

builtin/log.c

index f2a9f01..923ffe7 100644 (file)
@@ -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
 };