tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Thu, 27 Oct 2005 13:48:00 -0700
changeset 1474 1e47f6fc0fdc
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Add missing test output

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)