tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Sun, 17 Sep 2006 22:20:44 -0500
changeset 3130 da85145d4571
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
filectx: add rename traversal for parents()

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