Merge branch 'sm/show-superproject-while-conflicted' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:48 +0000 (22:57 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:48 +0000 (22:57 +0900)
commit9674e7a...33150d4f4a4752b25b4066bcd0406ddf
treec64c5d9...32346ddf2f6084154e98f8cb0cc8ee6acopy hash to clipboard (tree)
parent254db30...5ccf3413ab997c4baf2d3b8b7bb4c054copy hash to clipboard (diff)
parentc5cbb27...b5f0a94ac5d0882778a00add829ad9d9copy hash to clipboard (diff)
submodule.c