summaryrefslogtreecommitdiff
path: root/t/t7508-status.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-11-10 15:54:12 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-11-10 15:54:12 -0800
commit3b03097d66ecc5798d1c289b84adc4a02b12cd7c (patch)
tree074ff9fce2f8949b146f89e5ea895033513e3c7a /t/t7508-status.sh
parentt6026-merge-attr: ensure that the merge driver was called (diff)
downloadtgif-3b03097d66ecc5798d1c289b84adc4a02b12cd7c.tar.xz
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.
Diffstat (limited to 't/t7508-status.sh')
0 files changed, 0 insertions, 0 deletions