view tests/test-merge5.out @ 838:0fc4b1ab57e3

Merge with Matt.
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 04 Aug 2005 05:14:59 -0800
parents 0902ffece4b4 77e121a0d870
children 1fe3b14c7044 9c918287d10b
line wrap: on
line source

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