tests/test-merge5.out
author mpm@selenic.com
Wed, 14 Sep 2005 15:48:34 -0500
changeset 1244 937ee88da3ef
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
clone: fall back to pull if we can't lock the source repo

removing b
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)