author | Patrick Mezard <pmezard@gmail.com> |
Fri, 10 Sep 2010 22:36:04 +0200 | |
changeset 12208 | 482443557cad |
parent 8545 | 3682a19bb637 |
permissions | -rw-r--r-- |
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