The command used was:
svn merge -r28283:r28282 .
.....
r28283 | bugman | 2016-11-15 15:44:48 +0100 (Tue, 15 Nov 2016) | 4 lines
Changed paths:
M /trunk/gui/components/spectrum.py
Removal of a wx.ListCtrl.DeleteAllColumns() function call from the spectrum GUI element.
This function does not exist in wxPython-Phoenix and is redundant anyway due to the DeleteAllItems()
function call on the line before.
.....