]> git.ipfire.org Git - thirdparty/git.git/commit - t/t6406-merge-attr.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c1e0dc5) | patch
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)
commit3b03097d66ecc5798d1c289b84adc4a02b12cd7c
tree074ff9fce2f8949b146f89e5ea895033513e3c7atree | snapshot
parentc1e0dc59bddce765761a6f863c66ee0cd4b2ca09commit | diff
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.
t/t6026-merge-attr.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.