Mercurial > hg > mercurial-crew-with-dirclash

changeset 3959:f321d841dce5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with mpm
author Brendan Cully <brendan@kublai.com>
date Fri, 22 Dec 2006 17:05:10 -0800
parents a8eb050c6489 (diff) 2b87d3c5ab8e (current diff)
children c137e21dba5a
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-manifest-merging
+++ b/tests/test-manifest-merging
@@ -30,5 +30,5 @@ hg pull -q
 hg merge
 
 echo % revert to changeset 1 to simulate a failed merge
-rm -fr *
+rm -fr alpha beta gamma
 hg up -C 1