Mercurial > hg > pyhgsh

view tests/test-merge5.out @ 2059:a4c271765415

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: Use appropriate (that is: none) diff options on HP-UX.
author Sascha Wilde <wilde@sha-bang.de>
date Wed, 12 Apr 2006 17:53:04 +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)