The command used was:
svn merge -r8695:8696 svn+ssh://bugman@.../svn/relax/branches/relax_disp@r18123 .
.....
r8696 | semor | 2009-01-28 15:44:32 +0100 (Wed, 28 Jan 2009) | 7 lines
Changed paths:
M /branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py
Fixed a bug where the 'id' argument was not set.
This was proposed by Ed in a post at:
https://mail.gna.org/public/relax-devel/2009-01/msg00127.html
(Message-id: <7f080ed10901280059y3303254bv89c0c1293e9916c0@...>)
.....
