Moved Diff3Constants to UI. New: PluggableDiffMergeToolSpec, DiffMergeTool