view tests/test-merge5.out @ 882:bc9ca4d51d23

Merge IPv6 fix.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 10 Aug 2005 12:36:34 -0800
parents 9c918287d10b
children 5a034646e472
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)