The command used was:
svn merge -r8669:8670 svn+ssh://bugman@.../svn/relax/branches/relax_disp@r18123 .
.....
r8670 | semor | 2009-01-27 16:09:31 +0100 (Tue, 27 Jan 2009) | 5 lines
Changed paths:
M /branches/relax_disp/prompt/relax_disp.py
M /branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py
Added two unit tests for the relaxation dispersion code and fixed errors in the corresponding code.
More unit tests will be added soon to help debugging and developing.
.....
