Mercurial > hg

view tests/test-conflict.out @ 1735:791405fe9991

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i forgot to change the test output for test-hook.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 16 Feb 2006 14:34:59 -0800
parents 5a034646e472
children 7544700fd931
line wrap: on
line source

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