The command used was:
svn merge -r8698:8699 svn+ssh://bugman@.../svn/relax/branches/relax_disp@r18123 .
.....
r8699 | semor | 2009-01-28 19:37:12 +0100 (Wed, 28 Jan 2009) | 9 lines
Changed paths:
M /branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py
Fixed the unit tests.
This is as proposed by Ed in a post at:
https://mail.gna.org/public/relax-devel/2009-01/msg00132.html
(Message-id: <7f080ed10901280921t21fa4c3bpf70440d4c7a835b5@...>)
Thanks Ed !
.....
