Comment 4 for bug 1045849

The intended method for using an alternate command-line for a known merge tool is to register a new merge tool name ("winmerge-funkyoptions") with the modified command-line. To make the known merge tool commandlines editable would require also adding the ability to reset it back to defaults and allowing a merge tool definition in the config to override a known merge tool with the same name.

I am uncomfortable not showing the known merge tools in qconfig since they are actually defined and will be shown in the qconflicts dropdown if found on the PATH. What might be useful is to add another column to the table which shows a checkmark if the merge tool can be found by bzr.