view tests/test-merge8.out @ 3892:2eec996f2fb9

Fix demandload bits of setup.py py2exe support
author Matt Mackall <mpm@selenic.com>
date Thu, 14 Dec 2006 20:23:25 -0600
parents 9103dab96093
children 4787e2b0dd03
line wrap: on
line source

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