tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 28 Jul 2006 08:59:06 +0200
changeset 2726 6bd351194a96
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
permissions -rw-r--r--
Add test mq keeping a reference to localrepo which can't remove journal on exit.

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)