Merge branch 'dt/empty-submodule-in-merge' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:26 +0000 (14:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:26 +0000 (14:49 -0800)
commit0f47d3d...8ee2fc4c81950eeaf2c9a11b1a81bcad
tree6f47496...52479514fdef4b19163ec0ef7df99347copy hash to clipboard (tree)
parent7b0490f...1c7c9ce5a93f92ddd3bf7cae78a073e8copy hash to clipboard (diff)
parent5423d2e...005eca89481d3137569b2b96b4d133ffcopy hash to clipboard (diff)