tests/test-merge5.out
author mpm@selenic.com
Thu, 15 Sep 2005 14:06:58 -0500
changeset 1261 fccc90f1994e
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
test-hup: hgrc no longer created at init

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)