tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 16 Oct 2006 22:44:44 +0200
changeset 3417 6bd676ee8b99
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
Explicitly use "tip" in revision navigation. Rationale: the tip revision is a moving target and if somebody wants tip, it should be delivered.

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