From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Apr 2009 05:32:56 +0000 (-0700)
Subject: Merge branch 'cb/maint-merge-recursive-submodule-fix'
X-Git-Tag: v1.6.3-rc0~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2149e0f6a66cb4a5707ef6201763051d94f288af;p=thirdparty%2Fgit.git

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

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

2149e0f6a66cb4a5707ef6201763051d94f288af