change git diff tool to meld
remove an empty line