Update for new GgitCommitParents API
Fix getting correct parent for merge diff