tests/test-merge8.out
author Adrian Buehlmann <adrian@cadifra.com>
Sun, 04 Apr 2010 02:39:45 +0200
changeset 10828 1aa9464ce9ae
parent 9611 a3d73b3e1f8a
permissions -rw-r--r--
wix: refactor and new guids.wxi

updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved