merge-recursive: fix verbose output for multiple base trees
authorRené Scharfe <l.s.r@web.de>
Sat, 13 Aug 2016 12:16:04 +0000 (14:16 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2016 02:48:04 +0000 (19:48 -0700)
commita257165...5ba7ba85322a1e9f20168f31c61dae81
treebcb90b2...a499ce40ea2b1e0702531e6ae517c9ffcopy hash to clipboard (tree)
parentbeb518c...850f459a71a2cb9e1d36e677528a55c0copy hash to clipboard (diff)
merge-recursive.c
t/t3030-merge-recursive.sh