Improve Merge Configuration and Resolve Dialog

The qconfig Merge tab and the Conflict resolution dialogs are confusing to use even though they work.

I propose for the Conflict dialog:
1) In the Merge Tool text box (or drop down?), show the merge command or merge command name.
2) In the Merge Tool text box, let the tool tip be the command so user can see the whole command / name if it is not visible since they cannot scroll. (Alternatively, enable scroll?)
3) Remove the syntax help text from 'Use Configured Default' check box, it will be moved to the qconfig Merge tab.

I propose for the qconfig Merge tab:
1) Rename 'Definition' to 'Command' to be consistent with Diff configuration tab. You may optionally want to add a 'Name' like Diff, to help identify the command in short form.
2) Provide syntax help on this screen so user has the info they need, when they need it.

Please refer to the attached screen shots to see the current implementation and the suggested changes.

All pretty simple changes, but makes a world of difference to new and confused users like myself.