Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1635:ae61937c61c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix rcpath for hgwebdir case (sys.argv is empty)
author efiring@manini.soest.hawaii.edu
date Tue, 24 Jan 2006 13:59:11 +1300
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