view tests/test-merge5.out @ 3302:192085505f6f

filectx: add size method
author Matt Mackall <mpm@selenic.com>
date Mon, 09 Oct 2006 23:20:48 -0500
parents 49988d9f0758
children 41989e55fa37
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