Mercurial > hg > mercurial-crew-with-dirclash

changeset 5372:6f6aa7f3bc1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Matt Mackall <mpm@selenic.com>
date Thu, 04 Oct 2007 19:47:22 -0500
parents 17ed9b9a0d03 (current diff) 6b72ceef7472 (diff)
children 6aba1835a7b3
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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