view tests/test-merge5.out @ 5447:56591846f819

chunkiter: simplify iter logic
author Matt Mackall <mpm@selenic.com>
date Thu, 11 Oct 2007 00:46:49 -0500
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