Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2124:27fd8b7a6c51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleaned trailing whitespace in hgweb.py, removed command line shortcut for webdir-conf.
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Tue, 25 Apr 2006 00:43:40 +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)