Mercurial > hg
view tests/test-merge-force.out @ 9221:7469a87dfbbf
i18n-pt_BR: synchronized with 196d40e7c885 (1.3)
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Mon, 06 Jul 2009 10:39:46 -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