view tests/test-merge5.out @ 4535:121999244123

hg serve: don't lookup user-supplied names/addresses
author Matt Mackall <mpm@selenic.com>
date Sun, 10 Jun 2007 19:16:20 -0500
parents fffc8a733bf9
children
line wrap: on
line source

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