Merge branch 'mg/timestamp-t-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:09 +0000 (14:19 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:09 +0000 (14:19 +0900)
commit0445bd7b556283339bb4f07d11114ff8e50515af
tree9f734aa73cd58ada73fe6a1f61bdfff41c1a5020
parent6da2d14c8bd4105bd123dd82840915197f4c3442
parent5554451de61cb90e530f30b96e62d455e1eff6a1
Merge branch 'mg/timestamp-t-fix' into maint

A mismerge fix.

* mg/timestamp-t-fix:
  name-rev: change ULONG_MAX to TIME_MAX
builtin/name-rev.c