am -3: do not let failed merge from completing the error codepath
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Oct 2015 20:38:30 +0000 (13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Oct 2015 20:38:30 +0000 (13:38 -0700)
commitc63d4b2...e86876cc210d8bf22bd84d617f7815b7
tree05e8d7c...d26ae9998dfaaf47c9b7a20253d3f0d8copy hash to clipboard (tree)
parent22f698c...188243b313e024d618283e0293e37140copy hash to clipboard (diff)
builtin/am.c