tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Tue, 17 Oct 2006 22:09:56 -0500
changeset 3439 a7ef6b6cc311
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
branchtags: use changectx setting self.branchcache on entry avoids recursions in lookup

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