From: Junio C Hamano <junkio@cox.net>
Date: Mon, 27 Mar 2006 07:44:28 +0000 (-0800)
Subject: Merge branch 'lt/diffgen' into next
X-Git-Tag: v1.3.0-rc1~2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=ac93bfc3b64a8a3756263ecdadad3e7a117be597;p=git.git

Merge branch 'lt/diffgen' into next

* lt/diffgen:
  add clean and ignore rules for xdiff/
  Remove dependency on a file named "-lz"
---

ac93bfc3b64a8a3756263ecdadad3e7a117be597