using meld as git merge and diff tool