The command used was:
svn merge -r8328:8329 svn+ssh://bugman@.../svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses
.....
r8329 | semor | 2009-01-08 00:23:28 +0100 (Thu, 08 Jan 2009) | 5 lines
Changed paths:
M /branches/relax_disp/specific_fns/relax_disp.py
Renamed 'cdp.frq' to 'cdp.cpmg_frqs' so it is not confusing with the spectrometer frequency.
Indeed, 'cdp.cpmg_frqs' points to the CPMG pulse train frequency (nu_cpmg).
.....