Mercurial > hg
view tests/test-merge-force.out @ 9356:9488a4d64fb5
iss: take version from iscc command line or __version__.py
Requires InnoSetup Preprocessor to be installed.
author | Steve Borho <steve@borho.org> |
---|---|
date | Sun, 16 Aug 2009 21:23:48 -0500 |
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