Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1134:2cd33ea2f66b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjusted test-hup for generated .hg/hgrc
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 28 Aug 2005 18:30:40 +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)