The command used was:
svn merge -r25055:r25053 .
........
r25055 | tlinnet | 2014-08-18 17:59:16 +0200 (Mon, 18 Aug 2014) | 3 lines
Fix for unit test, testing how models are sorted before analysis.
This now resembles the previous state.
........
r25054 | tlinnet | 2014-08-18 17:59:14 +0200 (Mon, 18 Aug 2014) | 8 lines
Modified, that the order of sorting models for auto_analysis, should be:
Analytical first, then silico, and then numeric.
After this, the year for implementation should come first.
This makes sure that CR72 is analysed first.
And also DPL94 will be sorted first.
........