view tests/test-merge5.out @ 741:156dc2f3be7f

Fix some line wrapping manifest hash: 43af5dafa55e01f89727096f4d6784317f3eb0d6
author mpm@selenic.com
date Wed, 20 Jul 2005 20:11:23 -0500
parents d45d1c90032e
children 7e4843b7efd2
line wrap: on
line source

+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ echo This is file b1
+ hg add a b
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b22
+ hg commit '-tcomment #1' -d '0 0' -u user
+ hg update 0
+ rm b
+ hg commit -A '-tcomment #2' -d '0 0' -u user
+ yes k
+ 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)
+ exit 0