From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Nov 2016 23:54:12 +0000 (-0800)
Subject: Revert "t6026-merge-attr: ensure that the merge driver was called"
X-Git-Tag: v2.11.0-rc1~7^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3b03097d66ecc5798d1c289b84adc4a02b12cd7c?hp=3b03097d66ecc5798d1c289b84adc4a02b12cd7c

Revert "t6026-merge-attr: ensure that the merge driver was called"

This reverts commit c1e0dc59bddce765761a6f863c66ee0cd4b2ca09.

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