[PATCH] Set recommended resolution option in conflict dialogs

[Denis Kovalchuk]

Hello.

I would like to suggest a slight UX improvement for conflict dialogs.
Subversion provides an API for getting a recommended conflict resolution
option. For example, if a tree conflict has 'Postpone', 'Mark as resolved' and
only one 'Move and Merge' option, Subversion may recommend using the
'Move and Merge' option rather than attempting manual tree conflict resolution.

The patch sets a recommended option as the default choice in the text, property
and tree conflict dialogs. I think that this should simplify the process of
choosing a conflict resolution option for users.

Regards,

Denis Kovalchuk

[Stefan]

Thanks a lot for your patch!

Committed in r28868

Stefan