The command used was:
svn merge -r8718:8719 svn+ssh://bugman@.../svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses
The prompt package changes were manually ported to the user_functions package.
.....
r8719 | semor | 2009-02-02 23:55:37 +0100 (Mon, 02 Feb 2009) | 5 lines
Changed paths:
M /branches/relax_disp/prompt/relax_disp.py
M /branches/relax_disp/specific_fns/relax_disp.py
Removed the obsolete function 'relax_disp.r2eff_read()'.
R2eff values will be read directly by 'relax_data.read()' (see r8702 and r8703).
.....
