Mercurial > hg
view tests/test-conflict.out @ 1781:284fc722c342
add an optional argument to push only the specified revisions (push -r)
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 14 Feb 2006 21:11:57 +0100 |
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