fix bug with CombinedDiff calculation #355

this presently uses DiffTree between target and source commits which works incorrectly when the branch is both ahead and behind. This should ideally calculate merge-base and then diff the source commit to merge-base. It would be ideal however, if we just applied the generated format-patch, and figured out the exact diff from there (because the calculation skips merge commits).