mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Revert "t6026-merge-attr: ensure that the merge driver was called"
This reverts commit c1e0dc59bd
.
We are not interested in the stray process in the merge driver
started; we want it to be still around.
This commit is contained in:
parent
c1e0dc59bd
commit
3b03097d66
|
@ -193,8 +193,7 @@ test_expect_success 'custom merge does not lock index' '
|
|||
"* merge=ours" "text merge=sleep-one-second" &&
|
||||
test_config merge.ours.driver true &&
|
||||
test_config merge.sleep-one-second.driver ./sleep-one-second.sh &&
|
||||
git merge master &&
|
||||
test -f sleep.pid
|
||||
git merge master
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue