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 Thomas Arendsen Hein <thomas@intevation.de>
Thu, 27 Apr 2006 21:03:07 +0200
changeset 2141 ed631e83fa06
parent 1933 7544700fd931
child 2175 b2ae81a7df29
permissions -rw-r--r--
Corrected error message for incompatible revision flags.

merge: warning: conflicts during merge
merging a
merging a failed!
e7fe8eb3e180+0d24b7662d3e+ tip
something else
=======
something
M a
mercurial-crew-with-dirclash