The command used was:
svn merge -r8398:8399 svn+ssh://bugman@.../svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses
.....
r8399 | semor | 2009-01-12 01:54:56 +0100 (Mon, 12 Jan 2009) | 5 lines
Changed paths:
M /branches/relax_disp/specific_fns/relax_disp.py
Introduced a relaxError when chosing 'r1rho' as experiment type as this won't be implemented now.
Efforts will be concentrated on the CPMG code first, then on the R1rho code.
.....