index 9f03ce699e8f4c3c654065deae675d1a7b259c74..3af3f603fb2ad34368b4f53f523bdd71dffdf854 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^
'