tests/test-merge4.out
author Brendan Cully <brendan@kublai.com>
Mon, 30 Apr 2007 09:32:44 -0700
changeset 4394 a6436e9333db
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Also restore old rm -A behavior for inexact patterns

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)