From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Oct 2011 17:48:38 +0000 (-0700)
Subject: Merge branch 'bk/submodule-in-recursive-merge'
X-Git-Tag: v1.7.8-rc0~40
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2201cc8c977918c520e70093f4b74bbdf70afcc5;p=git.git

Merge branch 'bk/submodule-in-recursive-merge'

* bk/submodule-in-recursive-merge:
  submodule: Search for merges only at end of recursive merge
  submodule: Demonstrate known breakage during recursive merge
---

2201cc8c977918c520e70093f4b74bbdf70afcc5