The command used was:
svn merge -r15214:r15215 svn+ssh://bugman@.../svn/relax/branches/inversion-recovery .
.....
r15215 | semor | 2012-01-21 17:02:51 +0100 (Sat, 21 Jan 2012) | 7 lines
Changed paths:
M /branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit_exp_3param_inv_neg.py
Manually fix the script based on changes made during branch updating.
This is as discussed by Edward d'Auvergne in a post at:
https://mail.gna.org/public/relax-devel/2012-01/msg00001.html
(Message-id: <CAED9pY9pnJGs3oMk2DTw76xA1HoqHx0+wUD1gAdzbOAu6F87bg@...>)
.....
