Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 1297:496074e0a38b
Add win32text extension module.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 21 Sep 2005 14:23:25 -0700 |
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