Mercurial > hg

changeset 3987:c6f10448278f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-manifest-merging: we only need to remove files
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 24 Dec 2006 22:28:01 +0100
parents f921bcba405d
children 9dcf9d45cab8
files tests/test-manifest-merging
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-manifest-merging	Fri Dec 22 16:29:35 2006 -0800
+++ b/tests/test-manifest-merging	Sun Dec 24 22:28:01 2006 +0100
@@ -30,5 +30,5 @@
 hg merge
 
 echo % revert to changeset 1 to simulate a failed merge
-rm -fr alpha beta gamma
+rm -f alpha beta gamma
 hg up -C 1