tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Mon, 30 Jan 2006 13:01:16 +1300
changeset 1666 0fc1b588976f
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Added tag 0.8 for changeset 3a56574f329a368d645853e0f9e09472aee62349

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)