Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2145:5bb3cb9e5d13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make indentation of coverage code in run-tests.py nicer.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 27 Apr 2006 22:01:28 -0700
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)