From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Apr 2009 23:50:31 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.3-rc4~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d1c8c0c8c42912eb768a05115c798de50e595f8b;p=git.git

Merge branch 'maint'

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

Conflicts:
	combine-diff.c
---

d1c8c0c8c42912eb768a05115c798de50e595f8b