view tests/test-simplemerge-cmd.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 ea7b982b6c08
children e1f4343db740
line wrap: on
line source

(binary:application/octet-stream)