tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Sun, 29 Jan 2006 18:38:56 +1300
changeset 1656 14d73fff4c45
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
convert-repo: use commit rather than rawcommit

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)