Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1111:addcb77fe500

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add an old-http test case This uses a trivial Python http server to test pulling from a static http server.
author mpm@selenic.com
date Sat, 27 Aug 2005 18:27:45 -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