The commands used were:
svn merge -r3320:4200
svn+ssh://bugman@.../svn/relax/branches/consistency_tests_1.2/
svn resolved .
This is the second time the merge of the branch is done. The first attempt was erroneous and caused
by a beginner mistake by Sebastien Morin pointed out in the post by Edward d'Auvergne:
https://mail.gna.org/public/relax-devel/2007-12/msg00015.html (Message-id:
<7f080ed10712171508w44f86ee9s813793c246832aeb@...>
The main 1.2 line now contains all the code for consistency testing.