tests/test-merge6.out
author Volker Kleinfeld <Volker.Kleinfeld@gmx.de>
Mon, 24 Oct 2005 14:52:30 -0700
changeset 1421 a7631cf1326a
parent 1043 9344f5dd4488
child 2019 ced2d3620f95
permissions -rw-r--r--
Option -i broken in py2exe_for_demandload Using the includes option -i on modified py2exe is not working. Change: - setup.py: convert self.includes to a list.

pulling from ../B1
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg update' to get a working copy)
bar should remain deleted.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
pulling from ../A2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg update' to get a working copy)
bar should remain deleted.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo