diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:09 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:09 +0900 |
commit | 0445bd7b556283339bb4f07d11114ff8e50515af (patch) | |
tree | 9f734aa73cd58ada73fe6a1f61bdfff41c1a5020 /diffcore-delta.c | |
parent | Merge branch 'ma/pkt-line-leakfix' into maint (diff) | |
parent | name-rev: change ULONG_MAX to TIME_MAX (diff) | |
download | tgif-0445bd7b556283339bb4f07d11114ff8e50515af.tar.xz |
Merge branch 'mg/timestamp-t-fix' into maint
A mismerge fix.
* mg/timestamp-t-fix:
name-rev: change ULONG_MAX to TIME_MAX
Diffstat (limited to 'diffcore-delta.c')
0 files changed, 0 insertions, 0 deletions