comparison 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
comparison
equal deleted inserted replaced
4391:722417b3d7fa 4392:9770d260a405
50 -a 50 -a
51 51
52 not removing a: file has been marked for add (use -f to force removal) 52 not removing a: file has been marked for add (use -f to force removal)
53 adding a 53 adding a
54 adding b 54 adding b
55 adding c
55 not removing b: file is modified (use -f to force removal) 56 not removing b: file is modified (use -f to force removal)
56 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 57 c
58 3 files updated, 0 files merged, 0 files removed, 0 files unresolved