index 36d9a2ae3aa7adb0bff18bb2a4180a2ba4369766..166ddb1447db4c33a79f0e9aea21cb00e8a151f2 100755 (executable)
test_expect_success \
'rebase topic branch against new master and check git-am did not get halted' \
- 'git-rebase master && test ! -d .git/rebase'
+ 'git-rebase master && test ! -d .git/rebase-apply'
test_expect_success \
'rebase --merge topic branch that was partially merged upstream' \