Merge with crew-stable
authorPatrick Mezard <pmezard@gmail.com>
Thu, 04 Oct 2007 14:26:34 +0200
changeset 5370 6b72ceef7472
parent 5365 ac2ccdcf4539 (current diff)
parent 5369 8ab7de07f40e (diff)
child 5372 6f6aa7f3bc1c
Merge with crew-stable
--- a/tests/test-convert-git	Wed Oct 03 21:08:37 2007 +0200
+++ b/tests/test-convert-git	Thu Oct 04 14:26:34 2007 +0200
@@ -32,7 +32,7 @@
 
 # Remove the directory, then try to replace it with a file
 # (issue 754)
-git rm -r d
+git rm -f d/b
 commit -m t2
 echo d > d
 git add d