First cut at displaying the diffs for a merge.
treeb1c6f7f2c9a646109a9089b4e56a5c846c99614a
-rwxr-xr-x 65653 gitk