Mercurial Mercurial > hg-stable / 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 mpm@selenic.com
Fri, 26 Aug 2005 01:56:49 -0700
changeset 1060 e453d2053b2e
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
Merge from BOS, fix help

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