Merge branch 'maint'
commitb0085a716770d9d2876edd74c6119c48d9d6f232
authorJunio C Hamano <gitster@pobox.com>
Sat, 28 Mar 2009 08:16:46 +0000 (28 01:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 28 Mar 2009 08:16:46 +0000 (28 01:16 -0700)
tree3658953cbb5a9a2fd1bab5fe0bf80781a6362383
parenta1b1ae0571f6b57117678aeaa1939d97c992a254
parent9d5156496d2d32800df52fa372295c16ab2578f0
Merge branch 'maint'

* maint:
  test-lib: Clean up comments and Makefile.
  diff --no-index: Do not generate patch output if other output is requested
diff-no-index.c
t/Makefile
t/test-lib.sh