Merge branch 'lt/approxidate'
commit554555ac7da0b9b78bd97cff05daa60498eb1bba
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Sep 2009 05:11:36 +0000 (31 22:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Sep 2009 05:11:36 +0000 (31 22:11 -0700)
tree3eb0fceccbc644ff34cb66e84ec371b5047eabeb
parent909beb860b98d51eeb26ff1f97bfad40ef7d5970
parent931e8e27d94dbc24abc9c969ae0b414e0361abff
Merge branch 'lt/approxidate'

* 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
cache.h