comparison tests/test-convert-darcs.out @ 6298:53cbb33e1269

normallookup: during merges, restore the state saved by remove
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 18 Mar 2008 04:07:39 -0300
parents f29b7c8419cb
children b236f34ec1e9
comparison
equal deleted inserted replaced
6297:fed1a9c22076 6298:53cbb33e1269