am --abort: revert changes introduced by failed 3way merge
authorPaul Tan <pyokagan@gmail.com>
Sat, 6 Jun 2015 11:46:10 +0000 (19:46 +0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Jun 2015 20:09:20 +0000 (13:09 -0700)
commit20c3fe7...2105a29150fd21e3e0a340bca7890848
tree5da24f7...7d0ff7968cacead9980301fc14f5da43copy hash to clipboard (tree)
parentf8da680...e2fb3e46a42031b860c6411ef76a0335copy hash to clipboard (diff)
git-am.sh
t/t4151-am-abort.sh