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 Matt Mackall <mpm@selenic.com>
Tue, 08 Nov 2005 10:36:23 -0800
changeset 1515 3bd6d27cb81c
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
Fix up test-help, mark test-rename +x

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