Mercurial > hg
view tests/test-conflict.out @ 1960:dac4bd67f6c5
update test for unrelated repo.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Tue, 14 Mar 2006 23:00:45 -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