Mercurial > hg
view tests/test-merge-force.out @ 11202:f974fe896921
strip: hide unbundle messages by default
Unbundling is an internal implementation detail for strip, only show
them with --verbose.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 20 May 2010 13:27:28 -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