U    compiler/ngtcon.pas
A    tests/webtbs/tw36156.pp
--- Recording mergeinfo for merge of r43186 into '.':
 U   .
--- Merging r43594 into '.':
U    compiler/ncnv.pas
A    tests/test/units/cocoaall/tw36362.pp
--- Recording mergeinfo for merge of r43594 into '.':
 G   .
--- Merging r44788 into '.':
U    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r44788 into '.':
 G   .
--- Merging r45380 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r45380 into '.':
 G   .
--- Merging r45673 into '.':
U    compiler/pinline.pas
A    tests/webtbs/tw37228.pp
--- Recording mergeinfo for merge of r45673 into '.':
 G   .

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