tests/test-merge4.out
author Brendan Cully <brendan@kublai.com>
Wed, 29 Aug 2007 16:15:23 -0700
changeset 5230 bfd73b567b3d
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
When reverting a file which was renamed, also revert the old name

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)