tests/test-merge5.out
author Nathan Jones <nathanj@insightbb.com>
Tue, 26 Jun 2007 10:48:58 -0400
changeset 4802 7549cd526b7f
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Fix serve on Windows without win32* modules.

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