gitk: Unify handling of merge diffs with normal 2-way diffs
tree837030a96f2f277562fd175ae67b10479e0411e0
-rw-r--r-- 1771 Makefile
-rwxr-xr-x 287609 gitk
drwxr-xr-x - po