From: Junio C Hamano <junkio@cox.net>
Date: Wed, 5 Apr 2006 09:58:14 +0000 (-0700)
Subject: Merge branches 'master' and 'jc/combine' into next
X-Git-Tag: v1.3.0-rc4~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b4196cf70a5fcd659fe334e5c03a416383f41985;p=git.git

Merge branches 'master' and 'jc/combine' into next

* master:
  Add git-clean command
  diff_flush(): leakfix.
  parse_date(): fix parsing 03/10/2006

* jc/combine:
  combine-diff: refactor built-in xdiff interface.
---

b4196cf70a5fcd659fe334e5c03a416383f41985