+test_expect_success 'status when conflicts with only rm advice (both deleted)' '
+ test_when_finished "cd ../ && rm -rf git" &&
Is it intentional that you kept this potentially dangerous "cd ../ && rm
-rf git"? I saw you rewrote some instances in other patches, but not all
of them.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/