comparison tests/test-merge7.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 93a4e72b4f83
children 17ed9b9a0d03
comparison
equal deleted inserted replaced
4391:722417b3d7fa 4392:9770d260a405