Mercurial > hg
view tests/test-merge-force.out @ 10732:5484f6e17984 stable
wix: use build variable for VC redist source dir
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Fri, 19 Mar 2010 10:26:19 +0100 |
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