Merge branch 'mg/timestamp-t-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:28:06 +0000 (17:28 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:28:06 +0000 (17:28 +0900)
A mismerge fix.

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

1  2 
builtin/name-rev.c
Simple merge