The command used was:
svn merge -r15756:r15755 .
.....
r15756 | bugman | 2012-04-17 16:33:03 +0200 (Tue, 17 Apr 2012) | 6 lines
Changed paths:
M /1.3/relax.py
M /1.3/status.py
Added a flag to the status singleton object to signal if text output can be coloured.
This is only activated when sys.stdout has not been changed. Unix redirection and pipes will need
to be handled later (http://mail.python.org/pipermail/python-list/2012-April/1291044.html).
.....