Code

Merge branch 'maint-1.6.1' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 22:40:33 +0000 (15:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 22:40:33 +0000 (15:40 -0700)
commita2dc04ba159def766ee17db00c60bdbda477955d
tree961c12266b9374cd9eaa40b668ad3b897845d99c
parent2254da06a5473ffde973337bad2c6a96eea61e20
parent934747323c397ffe64b6dcdf2bf73128d8e36968
Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
  diff -c -p: do not die on submodules