tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Sun, 31 Jul 2005 17:31:15 -0800
changeset 819 77e121a0d870
parent 814 0902ffece4b4
child 824 0932bc2fb2be
permissions -rw-r--r--
Update output for test-merge5.

+ 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 merge across branches or -C to lose changes)