Merge branch 'maint-1.6.1' into maint
commit9d5156496d2d32800df52fa372295c16ab2578f0
authorJunio C Hamano <gitster@pobox.com>
Sat, 28 Mar 2009 07:41:50 +0000 (28 00:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 28 Mar 2009 07:41:50 +0000 (28 00:41 -0700)
treefad95db756d46083c1c948c1b44cddf9896f98c5
parenta8fac795ddaa004835fc688560cf19ca5500ce8d
parent81db4abf84ec7fbebeb08f6ad506138da2e7e4cd
Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
  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/test-lib.sh