Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1165:04be5eb73bb3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed import needed to serve zip files which broke because of other changes.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 30 Aug 2005 19:12:17 +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)