The command used was:
svn merge -r24827:r24826 .
.....
------------------------------------------------------------------------
r24827 | tlinnet | 2014-07-30 12:53:04 +0200 (Wed, 30 Jul 2014) | 4 lines
Fix for output catching after re-order or return_offset_data() function.
sr #3124(https://gna.org/support/?3124): Grace graphs production for R1rho analysis with R2_eff as function of Omega_eff.
sr #3138(https://gna.org/support/?3138): Interpolating theta through spin-lock offset [Omega], rather than spin-lock field strength [w1].
------------------------------------------------------------------------
.....
