log tests/test-merge-remove @ 7757:af6a63438a8a

age author description
Tue, 18 Mar 2008 04:07:39 -0300 Alexis S. L. Carvalho revert: update state of files in the "checkout" list
Tue, 18 Mar 2008 04:07:39 -0300 Alexis S. L. Carvalho normallookup: during merges, restore the state saved by remove
Tue, 18 Mar 2008 04:07:39 -0300 Alexis S. L. Carvalho dirstate.remove: during merges, remember the previous file state