git.el: Added a function to diff against the other heads in a merge.