added git-meld as external diff tool
corrected typo