Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 6254:3667b6e4bbd0 | 6255:ae83d927c629 |
|---|---|
| 1 % local deleted a file, remote removed | |
| 2 resolving manifests | |
| 3 removing a | |
| 4 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 5 (branch merge, don't forget to commit) | |
| 6 % should show a as removed | |
| 7 R a | |
| 8 % manifest. should not have a: | |
| 9 b |