Mercurial > hg

view tests/test-merge5.out @ 1966:f8b0e73e320f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg status cleanups: Don't translate long options, remove stray semicolon.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 17 Mar 2006 18:19:05 +0100
parents 5a034646e472
children ced2d3620f95
line wrap: on
line source

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