From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 1 Sep 2009 05:11:36 +0000 (-0700)
Subject: Merge branch 'lt/approxidate'
X-Git-Tag: v1.6.5-rc0~16
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=554555ac7da0b9b78bd97cff05daa60498eb1bba;p=git.git

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
---

554555ac7da0b9b78bd97cff05daa60498eb1bba