The command used was:
svn merge -r9863:9864 svn+ssh://bugman@.../svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses
.....
r9864 | semor | 2009-11-02 21:11:33 +0100 (Mon, 02 Nov 2009) | 5 lines
Changed paths:
M /branches/relax_disp/specific_fns/relax_disp.py
Solved an issue created during the merge process (r9863) concerning the 'return_data_name_doc' call.
The solution is based on the code in 'specific_fns/relax_fit.py'.
.....