The command used was:
svn merge -r8687:8688 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.
.....
r8688 | semor | 2009-01-27 23:24:12 +0100 (Tue, 27 Jan 2009) | 3 lines
Changed paths:
M /branches/relax_disp/prompt/relax_disp.py
M /branches/relax_disp/specific_fns/relax_disp.py
Changed the default value for 'int_cpmg' to avoid an impossible mathematical situation: ln(0).
.....
