tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Wed, 25 Oct 2006 16:35:35 -0700
changeset 3517 a6dd7ab568cc
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
zsh: make option lists more compact

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