tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Thu, 26 Jul 2007 12:02:58 -0500
changeset 5003 4d079df2871a
parent 3592 fffc8a733bf9
permissions -rw-r--r--
dirstate: speed up sorting in findfiles

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