Mercurial > hg
view tests/test-merge-force.out @ 9317:8c1df18452aa
Backed out changeset 5724cd7b3688 (depends on other changes, no tests)
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Wed, 05 Aug 2009 16:32:38 +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