Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 969:1d5b97537561

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor README updates
author mpm@selenic.com
date Sat, 20 Aug 2005 00:49:41 -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