Display the diffs for a merge in a unified fashion.
tree2e3020c2f717dcf855a5047fc9173f2268f61268
-rwxr-xr-x 77685 gitk