Mercurial > hg
view tests/test-merge-force.out @ 11680:7fefef3ce791
convert: warn on superfluous / in paths
shlex is really a bad parser for this line-based format ...
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 20 Jul 2010 15:49:28 +0200 |
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