Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1807:f1f43ea22cbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow repo lock to be passed in to localrepo.commit for performance
author mason@suse.com
date Tue, 28 Feb 2006 12:25:10 -0600
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