Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-conflict.out
author Peter van Dijk <peter@dataloss.nl>
Wed, 22 Feb 2006 15:57:43 +0100
changeset 1926 ba198d17eea9
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
changes by John Levon to standardize some erroroutput

merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a
mercurial-crew-with-dirclash