Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 2015:1a09814a5b1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Catch HTTPException when reading from remote http repository. If the server dies very early, an httplib.IncompleteRead exception may be raised, because httplib can't read a single byte. Catching all HTTPException subclasses here will prevent ugly backtraces for similar things, too.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 29 Mar 2006 12:45:33 +0200
parents 7544700fd931
children b2ae81a7df29
line wrap: on
line source

merge: warning: conflicts during merge
merging a
merging a failed!
e7fe8eb3e180+0d24b7662d3e+ tip
something else
=======
something
M a