Mercurial > hg
view tests/test-merge-force.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 | 69c75d063c7a |
children | 4b0c9c674707 |
line wrap: on
line source
% local deleted a file, remote removed abort: outstanding uncommitted changes resolving manifests removing a 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) % should show a as removed R a % manifest. should not have a: b