Merge branch 'lt/diffgen' into next
authorJunio C Hamano <junkio@cox.net>
Mon, 27 Mar 2006 07:44:28 +0000 (23:44 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 27 Mar 2006 07:44:28 +0000 (23:44 -0800)
* lt/diffgen:
  add clean and ignore rules for xdiff/
  Remove dependency on a file named "-lz"

1  2 
Makefile

diff --cc Makefile
Simple merge