Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1052:d8279ca39dc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjust display and alignment of command options to match global options.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 26 Aug 2005 09:56:33 +0200
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)