view tests/test-merge5.out @ 5463:3b204881f959

osutil: use fdopendir instead of dirfd
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 15 Oct 2007 12:57:01 -0700
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