U    packages/chm/src/chmcmd.lpi
--- Recording mergeinfo for merge of r39691 into '.':
 U   .
--- Merging r39758 into '.':
U    packages/fcl-base/src/fpexprpars.pp
--- Recording mergeinfo for merge of r39758 into '.':
 G   .
--- Merging r39831 into '.':
U    packages/fcl-net/src/ssockets.pp
--- Recording mergeinfo for merge of r39831 into '.':
 G   .
--- Merging r39840 into '.':
U    rtl/inc/fexpand.inc
U    tests/test/units/dos/tfexpand.pp
--- Recording mergeinfo for merge of r39840 into '.':
 G   .
--- Merging r39843 into '.':
U    rtl/objpas/sysutils/syshelp.inc
--- Recording mergeinfo for merge of r39843 into '.':
 G   .

# revisions: 39691,39758,39831,39840,39843

git-svn-id: branches/fixes_3_2@40527 -