diff tests/test-convert-git.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 3667b6e4bbd0
children 7239e06e58e9 c1dc903dc7b6
line wrap: on
line diff