Merge branch 'jk/merge-subtree-heuristics'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:55 +0000 (13:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:55 +0000 (13:09 -0700)
commit60858f3...3aa909305c28790c7684bf88905695a2
treea49486f...a05a68d019262140c24e63483a1affcccopy hash to clipboard (tree)
parent28bdd99...65afa449b59d864be776ecf587c5bc18copy hash to clipboard (diff)
parent2ec4150...13eabc725ba1c43fbe032adb43d5d4cfcopy hash to clipboard (diff)
match-trees.c
t/t6029-merge-subtree.sh