tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 26 Jun 2006 22:44:48 +0200
changeset 2502 18cf95ad3666
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
permissions -rw-r--r--
Allow using default values with ui.configlist, too, and add a test for this.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)