Disable merging of /trunk:r39724,39820,39822-39824,39828-39830
Changes svn:mergeinfo property in:
.
packages/rtl-objpas/src/inc/rtti.pp
packages/rtl-objpas/tests/tests.rtti.pas

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