U    compiler/nbas.pas
--- Recording mergeinfo for merge of r44096 into '.':
 U   .
--- Merging r46274 into '.':
G    compiler/nbas.pas
--- Recording mergeinfo for merge of r46274 into '.':
 G   .
--- Merging r48127 into '.':
A    tests/webtbs/tw38337.pp
--- Recording mergeinfo for merge of r48127 into '.':
 G   .

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