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 Vadim Gelfer <vadim.gelfer@gmail.com>
Thu, 13 Apr 2006 13:46:56 -0700
changeset 2064 547ede0123a2
parent 1933 7544700fd931
child 2175 b2ae81a7df29
permissions -rw-r--r--
util.unlink should only catch OSError.

merge: warning: conflicts during merge
merging a
merging a failed!
e7fe8eb3e180+0d24b7662d3e+ tip
something else
=======
something
M a
hg-stable