tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Thu, 29 Sep 2005 15:18:32 -0700
changeset 1364 0f25830f6bc3
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Fix data reported for the nullid changeset

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)