'git-meld' lets you merge changes from another branch or commit using a diff tool