# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1191500794 -7200
# Node ID 6b72ceef7472735ca5ec005d058bf85c5968e571
# Parent  ac2ccdcf4539bc7274f456a83f75e58c77251df5# Parent  8ab7de07f40e2226466c733268d18c63dd848bd8
Merge with crew-stable

diff -r ac2ccdcf4539 -r 6b72ceef7472 tests/test-convert-git
--- 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