diff tests/test-remove.out @ 4392:9770d260a405

Make rm --after simply mark files as removed, unless --force is also given
author Brendan Cully <brendan@kublai.com>
date Mon, 30 Apr 2007 08:51:59 -0700
parents b984dcb1df71
children cf5f35ec4720
line wrap: on
line diff
--- a/tests/test-remove.out
+++ b/tests/test-remove.out
@@ -52,5 +52,7 @@ diff -r 8ba83d44753d -r a1fce69c50d9 foo
 not removing a: file has been marked for add (use -f to force removal)
 adding a
 adding b
+adding c
 not removing b: file is modified (use -f to force removal)
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+c
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved