Mercurial > hg
view tests/test-merge-force.out @ 7530:3773e510d433 1.1.1
resolve: clarify and simplify help
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 19 Dec 2008 20:58:33 -0600 |
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