Mercurial > hg-stable

view tests/test-merge5.out @ 8264:63ea850b3312

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zeroconf: guess ip for Zeroconf Zeroconf() is actually pretty dumb in guessing IPs and in case of socket.gaierror will not guess right IP.
author Alexander Solovyov <piranha@piranha.org.ua>
date Mon, 27 Apr 2009 21:33:39 +0300
parents 0b89315d5de2
children 68a1b9d0663e
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')