Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 1505:27f08094cfe0
Add support for -r option in hg tag
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Thu, 03 Nov 2005 17:19:59 -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