Compare commits

...
A pull request between these branches already exists: jcarr/git2go#945

Add git_diff_merge #945