t/t3404: fix test for a bogus todo file.
The test wants to see if there are still remaining tasks, but checked a wrong file. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
9b2a182124
commit
aac5bf0b48
@ -149,7 +149,7 @@ test_expect_success 'stop on conflicting pick' '
|
||||
diff -u expect .git/.dotest-merge/patch &&
|
||||
diff -u expect2 file1 &&
|
||||
test 4 = $(grep -v "^#" < .git/.dotest-merge/done | wc -l) &&
|
||||
test 0 = $(grep -v "^#" < .git/.dotest-merge/todo | wc -l)
|
||||
test 0 = $(grep -v "^#" < .git/.dotest-merge/git-rebase-todo | wc -l)
|
||||
'
|
||||
|
||||
test_expect_success 'abort' '
|
||||
|
Loading…
Reference in New Issue
Block a user