Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 1325:57220daf40e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move urllib error handling from revlog into statichttprepo, where it belongs.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 23 Sep 2005 00:05:16 -0700
parents 5a034646e472
children 7544700fd931
line wrap: on
line source

merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a