git-diff: fix combined diff