The command used was:
svn merge -r8701:8702 svn+ssh://bugman@.../svn/relax/branches/relax_disp@r18123 .
.....
r8702 | semor | 2009-01-29 20:18:10 +0100 (Thu, 29 Jan 2009) | 3 lines
Changed paths:
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/r2eff
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/r2eff/r2eff.out
M /branches/relax_disp/test_suite/system_tests/relax_disp.py
Started to implement the reading of 'r2eff' by relax_data.read() by first writing a system test.
.....