osutil.c: use readdir instead of readdir64 Some systems (e.g. *BSD) don't have a readdir64 function - the regular readdir already uses 64-bit types. On other systems (Linux, Solaris, ...), if Python was compiled with large file support, Python.h will define _LARGEFILE_SOURCE and _FILE_OFFSET_BITS=64, so that any call to readdir will actually be a call to readdir64. If Python was not compiled with large file support, we probably don't want to define these macros to avoid ABI problems.

     1

adding a

     2

marked working directory as branch b

     3

adding b

     4

0 files updated, 0 files merged, 1 files removed, 0 files unresolved

     5

fast-forward

     6

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

     7

(branch merge, don't forget to commit)

     8

bogus fast-forward should fail

     9

abort: there is nothing to merge, just use 'hg update' or look at 'hg heads'

    10

done