marco 74aff88586 --- Merging r49045 into '.': %!s(int64=4) %!d(string=hai) anos
..
examples 5e6081f217 * Merging revisions 42789,42790,42791,42792,42793 from trunk: %!s(int64=6) %!d(string=hai) anos
src 2b75bf162b * Merging revisions r44346 from trunk: %!s(int64=5) %!d(string=hai) anos
tests 2b75bf162b * Merging revisions r44346 from trunk: %!s(int64=5) %!d(string=hai) anos
Makefile 74aff88586 --- Merging r49045 into '.': %!s(int64=4) %!d(string=hai) anos
Makefile.fpc 74aff88586 --- Merging r49045 into '.': %!s(int64=4) %!d(string=hai) anos
fpmake.pp 74aff88586 --- Merging r49045 into '.': %!s(int64=4) %!d(string=hai) anos