diff tests/test-pull @ 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 e3a0c092b4e2
children 2770d03ae49f
line wrap: on
line diff