Code

Merge branch 'lt/approxidate'
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Sep 2009 05:11:36 +0000 (22:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Sep 2009 05:11:36 +0000 (22:11 -0700)
* lt/approxidate:
  fix approxidate parsing of relative months and years
  tests: add date printing and parsing tests
  refactor test-date interface
  Add date formatting and parsing functions relative to a given time
  Further 'approxidate' improvements
  Improve on 'approxidate'

Conflicts:
date.c

1  2 
cache.h

diff --cc cache.h
Simple merge