tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Thu, 14 Dec 2006 20:23:25 -0600
changeset 3890 2eec996f2fb9
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
Fix demandload bits of setup.py py2exe support

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes