Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge-symlinks.out @ 5397:11caa374f497

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
osutil.c: include Python.h before the other headers This is recommended by the Python documentation, since Python.h defines some constants.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 06 Oct 2007 14:14:11 -0300
parents 786c1206a029
children 36794dbe66a3
line wrap: on
line source

% 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)