Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1967:72f7a335b955

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
still use old variable names when running hooks. dropped by accident. we set HG_FOO (new name) and FOO (old name). plan is to drop old names after 0.9.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 17 Mar 2006 09:48:43 -0800
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