Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1615:83238c1db6de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup of indentation, spacing, newlines, strings and line length
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 12 Jan 2006 07:57:58 +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)