tests/test-merge4.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 21 Aug 2007 02:13:32 +0200
changeset 5205 212de429e000
parent 2175 b2ae81a7df29
permissions -rw-r--r--
make hg add of a removed file unremove the file if a file was removed, hg add shouldn't mark the file as added, but as normal see issue683

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)