tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Mon, 30 Jan 2006 12:04:36 +1300
changeset 1665 3a56574f329a
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Merge with crew

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)