Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 2483:5583d5ef257e
Fixed conditional include of stdint.h for windows/msvc6/python2.3 environment.
author | Shun-ichi GOTO <shunichi.goto@gmail.com> |
---|---|
date | Thu, 22 Jun 2006 13:19:52 +0900 |
parents | b2ae81a7df29 |
children | 49988d9f0758 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b this update spans a branch affecting the following files: b aborting update spanning branches! (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)