diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-08 18:59:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 18:59:06 (GMT) |
| commit | bdb830c44567ebbdec497e6af21b87d4e43539cc (patch) | |
| tree | 1a56e047fa97260f688394304d36b2ff3d1c6ace /Documentation/git-merge.txt | |
| parent | 4e49d95ece7e023106349875df05fed0601920a5 (diff) | |
| parent | f80d1f95f0adf9909f42eb9e74546963daa4b0c1 (diff) | |
| download | git-bdb830c44567ebbdec497e6af21b87d4e43539cc.zip git-bdb830c44567ebbdec497e6af21b87d4e43539cc.tar.gz git-bdb830c44567ebbdec497e6af21b87d4e43539cc.tar.bz2 | |
Merge branch 'jk/commit-dates-parsing-fix'
Finishing touches for portability.
* jk/commit-dates-parsing-fix:
t4212: loosen far-in-future test for AIX
date: recognize bogus FreeBSD gmtime output
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions