tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 16 Dec 2006 22:58:10 +0100
changeset 3914 3c82ab166eea
parent 3592 fffc8a733bf9
permissions -rw-r--r--
doc fix: hg tags defaults to current parent revision, too. Additionally use better language for the help text for tag, cat and manifest.

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