The command used was:
svn merge -r16189:r16188 .
The GUI element can decide what to do in this case, for example add a None element to the list!
.....
r16189 | bugman | 2012-05-10 14:45:42 +0200 (Thu, 10 May 2012) | 6 lines
Changed paths:
M /branches/uf_redesign/user_functions/objects.py
Check that wiz_read_only is not set if can_be_none is True and a combo box is asked for.
The combo box needs to be editable to clear it - so it returns None. Otherwise if a user selects
one of the values, then they cannot unset it to allow for args of None.
.....
