Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2131:f5bbc5562434

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Try harder to display node hashes in tags view in monospaced font. Used to work around Firefox's behaviour if "Allow pages to choose their own fonts" is disabled.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 26 Apr 2006 07:03:10 +0200
parents 5c4496ed152d
children b2ae81a7df29
line wrap: on
line source

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)