tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 29 Jul 2005 15:21:02 +0100
changeset 801 1f9ec150a476
parent 767 61ed30e82b27
child 808 8f5637f0a0c0
permissions -rw-r--r--
Updated output of tests.

+ hg init
+ hg add a b
+ hg commit -m commit #0 -d 0 0
+ hg commit -mcomment #1 -d 0 0
+ hg update 0
+ hg commit -A -mcomment #2 -d 0 0
removing b
+ hg update 1
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to perform a branch merge)