tests/test-merge8.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 06 Oct 2007 14:14:11 -0300
changeset 5397 11caa374f497
parent 4416 bb1800a7d7e1
permissions -rw-r--r--
osutil.c: include Python.h before the other headers This is recommended by the Python documentation, since Python.h defines some constants.

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