tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Thu, 14 Sep 2006 19:24:00 -0700
changeset 3092 25857e00af8e
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
cat: default to working dir parent instead of tip This introduces a defaultrev function that chooses the working dir parent if a revision isn't specified, and uses it in several places.

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