log tests/test-merge-remove.out @ 6297:fed1a9c22076

age author description
Tue, 18 Mar 2008 04:07:39 -0300 Alexis S. L. Carvalho dirstate.remove: during merges, remember the previous file state