index 360a67060e1d1fd501fed7729712213360c456b2..8b19d3ccea5a0d5ff697661202347fbdfc6c330a 100755 (executable)
'rebase topic branch against new master and check git-am did not get halted' \
'git-rebase master && test ! -d .dotest'
'rebase topic branch against new master and check git-am did not get halted' \
'git-rebase master && test ! -d .dotest'
-if test -z "$no_python"
-then
- test_expect_success \
+test_expect_success \
'rebase --merge topic branch that was partially merged upstream' \
'git-checkout -f my-topic-branch-merge &&
git-rebase --merge master-merge &&
test ! -d .git/.dotest-merge'
'rebase --merge topic branch that was partially merged upstream' \
'git-checkout -f my-topic-branch-merge &&
git-rebase --merge master-merge &&
test ! -d .git/.dotest-merge'
-fi
test_done
test_done