Mercurial > hg

view tests/test-merge5.out @ 2095:0bf2a9e5eff1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't send "Content-Type: none" mimetypes.guess_type will return (None, None) when it can't detect the filetype.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 19 Apr 2006 11:41:22 -0700
parents 5c4496ed152d
children b2ae81a7df29
line wrap: on
line source

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