--- Merging r32795 into '.': U packages/hash/src/md5.pp --- Recording mergeinfo for merge of r32795 into '.': U . --- Merging r32804 into '.': U packages/openssl/src/openssl.pas --- Recording mergeinfo for merge of r32804 into '.': G . --- Merging r32805 into '.': U packages/openssl/examples/test1.pas --- Recording mergeinfo for merge of r32805 into '.': G . --- Merging r32806 into '.': U packages/fcl-fpcunit/src/demo/consolerunner/testrunner.pp U packages/fcl-fpcunit/src/fpcunit.pp --- Recording mergeinfo for merge of r32806 into '.': G . --- Merging r32809 into '.': U utils/fpdoc/fpdoc.pp --- Recording mergeinfo for merge of r32809 into '.': G . --- Merging r32814 into '.': U packages/rtl-unicode/src/collations/collation_zh_be.inc U packages/rtl-unicode/src/collations/collation_es_le.inc U packages/rtl-unicode/src/collations/collation_ko_le.inc U packages/rtl-unicode/src/collations/collation_zh.pas U packages/rtl-unicode/src/collations/collation_ru_be.inc U packages/rtl-unicode/src/collations/collation_sv_be.inc U packages/rtl-unicode/src/collations/collation_ja_be.inc U packages/rtl-unicode/src/collations/collation_ru.pas U packages/rtl-unicode/src/collations/collation_zh_le.inc U packages/rtl-unicode/src/collations/collation_de.pas U packages/rtl-unicode/src/collations/collation_sv.pas U packages/rtl-unicode/src/collations/collation_ja.pas U packages/rtl-unicode/src/collations/collation_ru_le.inc U packages/rtl-unicode/src/collations/collation_sv_le.inc U packages/rtl-unicode/src/collations/collation_ja_le.inc U packages/rtl-unicode/src/collations/collation_es_be.inc U packages/rtl-unicode/src/collations/collation_ko_be.inc U packages/rtl-unicode/src/collations/collation_es.pas U packages/rtl-unicode/src/collations/collation_ko.pas U packages/rtl-unicode/src/collations/collation_fr_ca.pas U packages/rtl-unicode/src/inc/ucadata.inc U packages/rtl-unicode/src/inc/ucadata_le.inc U packages/rtl-unicode/src/inc/ucadata_be.inc --- Recording mergeinfo for merge of r32814 into '.': G . --- Merging r32820 into '.': U packages/winunits-jedi/src/jwaactivex.pas U rtl/objpas/types.pp U rtl/objpas/classes/classesh.inc U rtl/objpas/classes/streams.inc --- Recording mergeinfo for merge of r32820 into '.': G . --- Merging r32826 into '.': U packages/fcl-process/src/process.pp --- Recording mergeinfo for merge of r32826 into '.': G . --- Merging r32860 into '.': U packages/paszlib/examples/miniunz.pas --- Recording mergeinfo for merge of r32860 into '.': G . --- Merging r32861 into '.': U packages/paszlib/src/zipper.pp --- Recording mergeinfo for merge of r32861 into '.': G . --- Merging r32862 into '.': A packages/paszlib/examples/fpzipper.lpi A packages/paszlib/examples/fpunzipper.lpi A packages/paszlib/examples/fpzipper.lpr A packages/paszlib/examples/fpunzipper.lpr --- Recording mergeinfo for merge of r32862 into '.': G . --- Merging r32868 into '.': U packages/fcl-fpcunit/src/consoletestrunner.pas --- Recording mergeinfo for merge of r32868 into '.': G . --- Merging r32891 into '.': A packages/fcl-process/examples A packages/fcl-process/examples/demoproject.ico A packages/fcl-process/examples/demoproject.pp A packages/fcl-process/examples/demoproject.lpi A packages/fcl-process/examples/echoparams.pp A packages/fcl-process/examples/demoproject.res --- Recording mergeinfo for merge of r32891 into '.': G . --- Merging r32892 into '.': A packages/fcl-process/examples/demoruncommand.lpi A packages/fcl-process/examples/demoruncommand.pp --- Recording mergeinfo for merge of r32892 into '.': G . --- Merging r32893 into '.': G packages/fcl-process/src/process.pp --- Recording mergeinfo for merge of r32893 into '.': G . --- Merging r32895 into '.': G utils/fpdoc/fpdoc.pp --- Recording mergeinfo for merge of r32895 into '.': G .