Mercurial > hg
view tests/test-conflict.out @ 2145:5bb3cb9e5d13
make indentation of coverage code in run-tests.py nicer.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 27 Apr 2006 22:01:28 -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