Configured meld for git merge