Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 1102:c81d264cd17d
localrepo: minor opener usage restructuring
author | mpm@selenic.com |
---|---|
date | Sat, 27 Aug 2005 16:34:54 -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