Code

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