The command used was:
svn merge -r8327:8328 svn+ssh://bugman@.../svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses
.....
r8328 | semor | 2009-01-08 00:16:20 +0100 (Thu, 08 Jan 2009) | 5 lines
Changed paths:
M /branches/relax_disp/specific_fns/relax_disp.py
Moved the relax_time() function to cpmg_frq() and made other small changes.
Still much (!) work is needed for this code to be complete.
.....