view tests/test-resolve.out @ 10930:230ab9a23594

wix updates

- using FileSource attribute
- removed unneeded "DiskId='1'"
- all guids are now in guids.wxi

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 update -C' to abandon
% resolve -l, should be empty