t4150: am --resolved fails if index has unmerged entries
authorPaul Tan <pyokagan@gmail.com>
Sun, 19 Jul 2015 15:49:12 +0000 (23:49 +0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Jul 2015 17:52:04 +0000 (10:52 -0700)
commit9e2a113...b95fb7e7eb3c74c1d0edc15be14fc0cf
tree6d53e13...a838cdd2460dfab99a64d0532121d5c1copy hash to clipboard (tree)
parent60ff7f9...5c818d1e59daa47467c61ad53be2c5eccopy hash to clipboard (diff)
t/t4150-am.sh