index 47ca88fc5231a5e0689b43a35eb660285a73190d..0eb21cbdee6a5f5245bbd4d130f96c2c1b36de65 100755 (executable)
git rm --cached file1 &&
git commit -m "remove file in base" &&
test_must_fail git rebase -i master > output 2>&1 &&
- grep "Untracked working tree file .file1. would be overwritten" \
+ grep "The following untracked working tree files would be overwritten by checkout:" \
output &&
+ grep "file1" output &&
! test -d .git/rebase-merge &&
git reset --hard HEAD^
'