diff tests/test-merge4.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 b2ae81a7df29
children 4b0c9c674707
line wrap: on
line diff