Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 1916:95b2e14841f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix test failures that depend on when tests run.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 05 Mar 2006 17:08:35 -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