tests/test-merge5.out
author Joel Rosdahl <joel@rosdahl.net>
Mon, 04 Jun 2007 21:48:59 +0200
changeset 4504 c68e6486f295
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Add test reproducing a bug in "hg serve -v"

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