From: Junio C Hamano Date: Fri, 21 Jul 2017 21:57:36 +0000 (-0700) Subject: Merge branch 'jc/po-pritime-fix' X-Git-Tag: v2.14.0-rc1~6 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a491307448356087da7a96503192550175446d9d;p=git-core%2Fgit.git Merge branch 'jc/po-pritime-fix' We started using "%" PRItime, imitating "%" PRIuMAX and friends, as a way to format the internal timestamp value, but this does not play well with gettext(1) i18n framework, and causes "make pot" that is run by the l10n coordinator to create a broken po/git.pot file. This is a possible workaround for that problem. * jc/po-pritime-fix: Makefile: help gettext tools to cope with our custom PRItime format --- a491307448356087da7a96503192550175446d9d