git mergetool fixes
Make Dia window floating