# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1191545242 18000
# Node ID 6f6aa7f3bc1c8e2953af95dbb0be7489074104fb
# Parent  17ed9b9a0d03c7455e9d03e83e894f5144534262# Parent  6b72ceef7472735ca5ec005d058bf85c5968e571
Merge with crew

diff --git a/tests/test-convert-git b/tests/test-convert-git
--- a/tests/test-convert-git
+++ b/tests/test-convert-git
@@ -32,7 +32,7 @@ commit -a -m t1
 
 # 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