tests/test-merge5.out
author Danek Duvall <danek.duvall@sun.com>
Fri, 18 Aug 2006 10:24:04 -0700
changeset 2932 d77022db1bca
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
Solaris portability fixes

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