From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 18 Apr 2009 21:18:25 +0000 (-0700)
Subject: Merge branch 'cb/maint-merge-recursive-submodule-fix' into maint
X-Git-Tag: v1.6.3-rc1~4^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=eb8a1c4aed2728e1be1c5e39fb9e5a3f4b209fc4;p=git.git

Merge branch 'cb/maint-merge-recursive-submodule-fix' into maint

* cb/maint-merge-recursive-submodule-fix:
  simplify output of conflicting merge
  update cache for conflicting submodule entries
  add tests for merging with submodules
---

eb8a1c4aed2728e1be1c5e39fb9e5a3f4b209fc4