Andrew's git / gitweb.git / diff
?
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)
This reverts commit c1e0dc59bddce765761a6f863c66ee0cd4b2ca09.

We are not interested in the stray process in the merge driver
started; we want it to be still around.

No differences found