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

* km/log-usage-string-i18n:
  log.c: fix translation markings
This commit is contained in:
Junio C Hamano 2015-01-14 12:32:39 -08:00
commit e9f91191cc

View 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
};