H0llyW00dzZ/git
H0llyW00dzZ/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-04-15 01:15:54 +00:00
Code Releases Activity

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

Browse Source 
This reverts commit c1e0dc59bddce765761a6f863c66ee0cd4b2ca09.

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:
Junio C Hamano 2016-11-10 15:54:12 -08:00
parent c1e0dc59bd
commit 3b03097d66
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
t/t6026-merge-attr.sh
View File

@ -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