I was unsuccessful in handling some merge commits. In particular merge commits that contain changes directly. For example, when a merge conflict occurs and the user decides to resolve conflict in the merge commit. Eventually I sprinkled trace_printf into git and found that there is a routine, diff_tree_combined, that handles the magic of displaying changes that were done in a merge commit itself.

Does anyone know if something like diff_tree_combined in libgit2?