Merge branch 'kw/merge-recursive-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Sep 2017 01:47:56 +0000 (10:47 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Sep 2017 01:47:56 +0000 (10:47 +0900)
commit6701263...56ca5c0f13703d2f185e0aad81e928cb
tree1824e8e...53e2837292075e7a6aa9807da0b4875bcopy hash to clipboard (tree)
parent0543de4...8f39cc99bcde807313e972a6caac5840copy hash to clipboard (diff)
parentfc65b00...a7ebfc96d3b93a59ee99f820deb5c93ecopy hash to clipboard (diff)
merge-recursive.c