diff tests/test-simplemerge-cmd @ 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 c6413f8f2f8e
children e1f4343db740
line wrap: on
line diff