added .diff for meld git diff management