Mercurial > hg
view tests/test-merge-force.out @ 8928:1e16f9b21ce4
test-globalopts: broken by output change in 62e3b9466700
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Tue, 23 Jun 2009 23:05:51 +0200 |
parents | 3682a19bb637 |
children |
line wrap: on
line source
created new head % local deleted a file, remote removed abort: outstanding uncommitted changes (use 'hg status' to list 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