Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 1733:6d288d8c3ca6
fix test-help diff options.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 16 Feb 2006 09:09:45 -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