The commands used were:
svn merge -r8363:8364 svn+ssh://bugman@.../svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses
svn merge -r8363:8364 svn+ssh://bugman@.../svn/relax/branches/relax_disp/test_suite/@r18123 test_suite
.....
r8364 | semor | 2009-01-10 21:57:57 +0100 (Sat, 10 Jan 2009) | 3 lines
Changed paths:
M /branches/relax_disp/specific_fns/relax_disp.py
M /branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
Changed the format of the CPMG frequency and corrected the names of some input files.
.....