tests/test-merge-force.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 31 Mar 2008 18:44:12 +0200
changeset 6419 7c36aee46bf5
parent 6336 4b0c9c674707
child 8545 3682a19bb637
permissions -rw-r--r--
hg serve: add clearer message when starting the server with --verbose Explicitly tell the address is the one the process is bound to. Fix the printing of IPv6 addresses.

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted changes
resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should show a as removed
R a
% manifest. should not have a:
b