Mercurial Mercurial > mercurial / 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>
Mon, 30 Jan 2006 12:04:36 +1300
changeset 1665 3a56574f329a
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
Merge with crew

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