Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1239:29f17e083e84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Turn hgit into an extension, and add commands supporting the latest gitk
author mason@suse.com
date Tue, 13 Sep 2005 19:33:10 -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