meld use,prompt setting fix
diff tool fix