The command used was:
svn merge -r13115:r13116 svn+ssh://bugman@.../svn/relax/branches/inversion-recovery .
.....
r13116 | semor | 2011-06-17 18:18:43 +0200 (Fri, 17 Jun 2011) | 5 lines
Changed paths:
A /branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit_exp_3param_inv_neg.py (from /branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit_exp_2param_neg.py:13114)
Created a system test script for the inversion-recovery function.
This is based on a copy of the script 'relax_fit_exp_2param_neg.py'.
.....