am --skip: revert changes introduced by failed 3way merge
authorPaul Tan <pyokagan@gmail.com>
Sat, 6 Jun 2015 11:46:07 +0000 (19:46 +0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Jun 2015 20:05:43 +0000 (13:05 -0700)
commit88d5072...66de2e0ba256a283eaaa6a79e31735a5
tree95b295e...faf8fd1c29a64f3aea7930d1e7a1ab9ecopy hash to clipboard (tree)
parentfdf96a2...acf96a6ac538df8113b2aafd6ed71d50copy hash to clipboard (diff)
git-am.sh
t/t4151-am-abort.sh