Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 1704:c2755eba8631
display revision numbers
revision numbers are useful for orientation when browsing
through the changelog
author | Johannes Stezenbach <js@linuxtv.org> |
---|---|
date | Mon, 06 Feb 2006 17:35:22 -0600 |
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