author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
Fri, 26 Feb 2010 16:52:43 +0100 | |
branch | stable |
changeset 10551 | f61dced1367a |
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