Revert "t6026-merge-attr: ensure that the merge driver was called"
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Nov 2016 23:54:12 +0000 (15:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Nov 2016 23:54:12 +0000 (15:54 -0800)
commit3b03097...66ecc5798d1c289b84adc4a02b12cd7c
tree074ff9f...e2f8949b146f89e5ea895033513e3c7acopy hash to clipboard (tree)
parentc1e0dc5...bddce765761a6f863c66ee0cd4b2ca09copy hash to clipboard (diff)
t/t6026-merge-attr.sh