The command used was:
svn merge -r8324:8325 svn+ssh://bugman@.../svn/relax/branches/relax_disp@r18123 .
.....
r8325 | semor | 2009-01-07 22:23:22 +0100 (Wed, 07 Jan 2009) | 3 lines
Changed paths:
M /branches/relax_disp/test_suite/system_tests/relax_disp.py
D /branches/relax_disp/test_suite/system_tests/scripts/relax_disp.py
A /branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py (from /branches/relax_disp/test_suite/system_tests/scripts/relax_disp.py:8324)
Added a test for CPMG data in slow-exchange and changed the name of the test for fast-exchange.
.....