[PATCH] gitk: Heed the lines of context in merge commits
-rw-r--r-- 1610 Makefile
-rwxr-xr-x 238493 gitk
drwxr-xr-x - po