Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5459:b0e5f44fdeb3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mpatch: Define Py_ssize_t for old pythons and use it instead of ssize_t. See also PEP 353. NOTE: Microsoft compilers (8 or earlier) does not have ssize_t.
author Shun-ichi GOTO <shunichi.goto@gmail.com>
date Fri, 12 Oct 2007 11:46:49 +0900
parents fffc8a733bf9
children
line wrap: on
line source

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