From: Junio C Hamano Date: Wed, 18 Oct 2017 05:19:09 +0000 (+0900) Subject: Merge branch 'mg/timestamp-t-fix' into maint X-Git-Tag: v2.15.0-rc2~5^2~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0445bd7b556283339bb4f07d11114ff8e50515af;p=thirdparty%2Fgit.git Merge branch 'mg/timestamp-t-fix' into maint A mismerge fix. * mg/timestamp-t-fix: name-rev: change ULONG_MAX to TIME_MAX --- 0445bd7b556283339bb4f07d11114ff8e50515af