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