view tests/test-resolve.out @ 9356:9488a4d64fb5

iss: take version from iscc command line or __version__.py

Requires InnoSetup Preprocessor to be installed.

adding file
% create a second head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
% failing merge
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
% resolve -l, should be empty