Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 1654:b7fc961507db
deprecate the use of 'hg tag NAME [REV]'
add some tests and some doc
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sun, 29 Jan 2006 17:12:31 +1300 |
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