Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1236:67a28636ea64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bug with co -C across branches, update tests
author mpm@selenic.com
date Tue, 13 Sep 2005 18:38:27 -0500
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