Mercurial > hg
diff tests/test-imerge.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 | c0c4c7b1e8d3 |
children | 4b0c9c674707 |