Mercurial > hg
view tests/test-merge-force.out @ 9457:f3f400b13984
convert: disable SVN support due to library license incompatibility
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 23 Sep 2009 00:23:50 -0500 |
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