tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Thu, 05 Jul 2007 12:08:48 -0700
changeset 4809 c2d529f288a1
parent 3592 fffc8a733bf9
permissions -rw-r--r--
convert: move some code into common init function

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes