diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-09 11:59:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-09 11:59:38 -0700 |
| commit | b8a30194dbea86228aa55fb270f3d704cf7924f4 (patch) | |
| tree | 2a844dbab6da69248532e464e1a16547fe047022 /resolve-undo.c | |
| parent | 693b407077bf3739b3609400845e3f6854830ee4 (diff) | |
| parent | f80d1f95f0adf9909f42eb9e74546963daa4b0c1 (diff) | |
| download | git-b8a30194dbea86228aa55fb270f3d704cf7924f4.tar.gz git-b8a30194dbea86228aa55fb270f3d704cf7924f4.tar.xz | |
Merge branch 'jk/commit-dates-parsing-fix' into maint
* jk/commit-dates-parsing-fix:
t4212: loosen far-in-future test for AIX
date: recognize bogus FreeBSD gmtime output
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions