Merge branch 'maint-1.6.0' into maint-1.6.1
commit934747323c397ffe64b6dcdf2bf73128d8e36968
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 20:43:13 +0000 (29 13:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 20:43:13 +0000 (29 13:43 -0700)
treea02906b87b716d48d56b9b0de209fe02da65969e
parent3e73cb2f48cc4044905455a9936692f967a0f9b3
parent7dae8b21c2fe39a59661c709f0dc17090dafa5a4
Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  diff -c -p: do not die on submodules
combine-diff.c
t/t4027-diff-submodule.sh