Merge branch 'gv/portable' into next
commit1add99cd9c82db6a13a1a0ccff52e8d33bcfdbc2
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:23:44 +0000 (13 11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:23:44 +0000 (13 11:23 -0700)
tree06435bf7d8beaf17ec91311b4944ef053fea20de
parent6d1fdd6097d816d05a836796d4aefc3fe7197150
parent5e87eae97df69a48a575fd79131e85067f9dbf13
Merge branch 'gv/portable' into next

* gv/portable:
  test-lib: use DIFF definition from GIT-BUILD-OPTIONS
Makefile
t/test-lib.sh