tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Thu, 04 Aug 2005 05:14:59 -0800
changeset 838 0fc4b1ab57e3
parent 814 0902ffece4b4
parent 819 77e121a0d870
child 836 1fe3b14c7044
child 839 9c918287d10b
permissions -rw-r--r--
Merge with Matt.

+ 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)