U    compiler/dbgdwarf.pas
--- Recording mergeinfo for merge of r43264 into '.':
 U   .
--- Merging r45050 into '.':
U    compiler/defutil.pas
U    compiler/nmat.pas
--- Recording mergeinfo for merge of r45050 into '.':
 G   .
--- Merging r45051 into '.':
U    compiler/scanner.pas
--- Recording mergeinfo for merge of r45051 into '.':
 G   .
--- Merging r45052 into '.':
G    compiler/scanner.pas
--- Recording mergeinfo for merge of r45052 into '.':
 G   .
--- Merging r45053 into '.':
G    compiler/scanner.pas
A    tests/tbs/tb0670.pp
--- Recording mergeinfo for merge of r45053 into '.':
 G   .
--- Merging r47601 into '.':
G    compiler/scanner.pas
--- Recording mergeinfo for merge of r47601 into '.':
 G   .
--- Merging r47602 into '.':
U    compiler/scandir.pas
U    tests/tbs/tb0596.pp
--- Recording mergeinfo for merge of r47602 into '.':
 G   .

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