Mercurial > hg

view tests/test-conflict.out @ 2166:d0c02b4dce9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not check sys.argv from localrepo when running hooks. instead add traceback field to ui class.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 30 Apr 2006 16:30:39 -0700
parents 7544700fd931
children b2ae81a7df29
line wrap: on
line source

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