Tutorial for resolving git merge conflicts with meld.