tests/test-merge-symlinks.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 06 Oct 2007 14:14:11 -0300
changeset 5397 11caa374f497
parent 5391 786c1206a029
child 5408 36794dbe66a3
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.

% create heads
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
% merge heads
HG_MY_ISLINK 1
HG_OTHER_ISLINK 0
HG_BASE_ISLINK 0
merging l
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)