combine-diff: finishing touches to git-diff-tree --cc