tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 25 Jun 2007 22:41:15 +0200
changeset 4717 97369f6a6bb6
parent 3592 fffc8a733bf9
permissions -rw-r--r--
New config option: ui.report_untrusted (defaults to True)

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