index 08bf1f08e331790d1a4e2fd1c698ecd5ea860e41..83896e96876d8cca24496c7cb278732a308e3d92 100755 (executable)
"
-test_expect_success 'check that rebase really failed' 'test -d .git/rebase'
+test_expect_success 'check that rebase really failed' '
+ test -d .git/rebase-apply
+'
test_expect_success 'resolve, continue the rebase and dcommit' "
echo clobber and I really mean it > file &&