am -3: use merge_recursive() directly again
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 26 Jul 2016 16:06:30 +0000 (18:06 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Jul 2016 18:13:44 +0000 (11:13 -0700)
commit3f338f4...b0eb8081660bbf694074a368cf07355e
treec02a0a4...f5c55583be4d2bf4946e527a2016c1c5copy hash to clipboard (tree)
parent6003303...1e5086a9f28f18469a8a72ad22f75c86copy hash to clipboard (diff)
builtin/am.c