The command used was:
svn merge -r25767:r25766 .
.....
r25767 | bugman | 2014-09-12 10:08:13 +0200 (Fri, 12 Sep 2014) | 6 lines
Changed paths:
M /branches/frame_order_cleanup/specific_analyses/frame_order/uf.py
Added a call to check_pivot() to the frame_order.select_model user function.
This is to prevent this user function from being called before the pivot has been set, as otherwise
the parameter vector will be incorrectly set up.
.....