qconflicts crashes due to call to non-existent function

In conflicts.py, function update_program_edit_text, line 329, the qbzr config is retrieved and then get_user_option used to access an option. This function doesn't exist: it should be get_option.