Code

Merge branch 'maint-1.6.1' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 28 Mar 2009 07:41:50 +0000 (00:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 28 Mar 2009 07:41:50 +0000 (00:41 -0700)
* maint-1.6.1:
  test-lib: Clean up comments and Makefile.
  diff --no-index: Do not generate patch output if other output is requested

1  2 
diff-no-index.c
t/test-lib.sh

diff --cc diff-no-index.c
Simple merge
diff --cc t/test-lib.sh
Simple merge