Mercurial > hg
view tests/test-merge-force.out @ 6255:ae83d927c629
add a test for a375ffc2aa1b
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 14 Mar 2008 09:56:58 -0300 |
parents | |
children | 69c75d063c7a |
line wrap: on
line source
% local deleted a file, remote removed 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