Merge branch 'da/mergetool-winmerge'

Hotfix for an earlier change already in 'master' that broke the default tool selection for mergetool. * da/mergetool-winmerge: mergetool-lib: fix default tool selection