Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 23:50:31 +0000 (16:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 23:50:31 +0000 (16:50 -0700)
commitd1c8c0c8c42912eb768a05115c798de50e595f8b
tree6fdc20e6a100a21c0c9dbae6bcb0ab9e543a4fed
parent3e8a00ae1d529e61f38f36fdb504902064cf1f5d
parenta2dc04ba159def766ee17db00c60bdbda477955d
Merge branch 'maint'

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

Conflicts:
combine-diff.c
combine-diff.c