tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Sun, 10 Jun 2007 19:16:20 -0500
changeset 4535 121999244123
parent 3592 fffc8a733bf9
permissions -rw-r--r--
hg serve: don't lookup user-supplied names/addresses

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