Mercurial > hg

view tests/test-merge5.out @ 3616:cf001fb04109

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Corrected documentation for return value of python hooks.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 05 Nov 2006 21:57:52 +0100
parents fffc8a733bf9
children 4b0c9c674707
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes