Merge branch 'lt/approxidate' into next
commite016e3dd41a2e439f7ecbf56258155db3121288b
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Aug 2009 05:07:11 +0000 (30 22:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Aug 2009 05:07:11 +0000 (30 22:07 -0700)
tree1953417ced399bf372f0d233031373ab7e63dd65
parent0623572bf07b478da3b6425d457170661357f5e5
parent931e8e27d94dbc24abc9c969ae0b414e0361abff
Merge branch 'lt/approxidate' into next

* 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

Conflicts:
date.c
cache.h