Merge branch 'sm/show-superproject-while-conflicted'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Oct 2018 04:34:04 +0000 (13:34 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Oct 2018 04:34:04 +0000 (13:34 +0900)
commitd152a74...2584dd0e235c9bcc97ef6a9ed239994a
treea8a6534...06e4f64409580b49607cd0a0f9aaada9copy hash to clipboard (tree)
parenta1e9dff...82b19a2620aab036c22389d22b9dd0becopy hash to clipboard (diff)
parentc5cbb27...b5f0a94ac5d0882778a00add829ad9d9copy hash to clipboard (diff)
submodule.c