Mercurial > hg
view tests/test-merge-force.out @ 7465:8f0305874701
tests: allow cvs import to reorder its filename list
Also fix script to generate non-zero length test file b.
author | Frank Kingswood <frank@kingswood-consulting.co.uk> |
---|---|
date | Mon, 01 Dec 2008 13:42:04 +0000 |
parents | 4b0c9c674707 |
children | 3682a19bb637 |
line wrap: on
line source
created new head % local deleted a file, remote removed abort: outstanding uncommitted 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