From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Oct 2018 04:34:04 +0000 (+0900)
Subject: Merge branch 'sm/show-superproject-while-conflicted'
X-Git-Tag: v2.20.0-rc0~158
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d152a74e2584dd0e235c9bcc97ef6a9ed239994a

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

A corner-case bugfix.

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

d152a74e2584dd0e235c9bcc97ef6a9ed239994a