tests/test-merge5.out
author "Rafael Villar Burke <pachi@rvburke.com>"
Fri, 02 Nov 2007 20:09:21 +0100
changeset 5484 07bdb5e5d08c
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
Update convert help text Add Mercurial as a source format, clarify that the include directive triggers the exclusion of all not explicitely included files/dirs and use MAPFILE instead of revmapfile in the text, following the short message convention.

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