Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2543:860e9c83fc59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include inttypes.h instead of stdint.h (fixes issue299) Many projects use inttypes.h, too. stdint.h isn't available everywhere, e.g. on some versions of Solaris, while inttypes.h is available everywhere where stdint.h is.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 30 Jun 2006 21:41:46 +0200
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)