author | Adrian Buehlmann <adrian@cadifra.com> |
Fri, 13 Aug 2010 00:34:44 +0200 | |
changeset 11867 | 20bd477d0e89 |
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