From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Nov 2018 13:57:48 +0000 (+0900)
Subject: Merge branch 'sm/show-superproject-while-conflicted' into maint
X-Git-Tag: v2.19.2~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9674e7a333150d4f4a4752b25b4066bcd0406ddf;p=thirdparty%2Fgit.git

Merge branch 'sm/show-superproject-while-conflicted' into maint

A corner-case bugfix.

* sm/show-superproject-while-conflicted:
  rev-parse: --show-superproject-working-tree should work during a merge
---

9674e7a333150d4f4a4752b25b4066bcd0406ddf