Mercurial > hg
view tests/test-manifest.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 | f11554a097c8 |
children | 7239e06e58e9 |
line wrap: on
line source
a b/a l 644 a 755 * b/a 644 @ l b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a 047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l a l a b/a l a b/a l % should fail abort: unknown revision '2'! abort: please specify just one revision a b/a l