t6026-merge-attr: ensure that the merge driver was called
authorAndreas Schwab <schwab@suse.de>
Thu, 10 Nov 2016 08:31:18 +0000 (09:31 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Nov 2016 19:20:56 +0000 (11:20 -0800)
commitc1e0dc5...bddce765761a6f863c66ee0cd4b2ca09
treee3d7779...6f35f8f50701733c585e1f3aa625a10fcopy hash to clipboard (tree)
parent734fde2...7167e4b20d2ff6062ade3846949b0741copy hash to clipboard (diff)
t/t6026-merge-attr.sh