Mercurial > hg
view tests/test-merge-force.out @ 10441:dc0d1ca2d378
progress: only reset state if finishing progress for the current topic
This prevents some visual glitches when doing a clone --pull locally.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Sat, 13 Feb 2010 09:49:06 -0600 |
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