Mercurial > hg
view tests/test-merge-force.out @ 9755:d64bdaeaa2b9
i18n-de: Removed all fuzzies and translated small alphaend-extensions
author | Fabian Kreutz <fabian.kreutz@starnet.fi> |
---|---|
date | Tue, 20 Oct 2009 17:31:09 +0300 |
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