gitk: Cope with unmerged files in local changes
tree55f3847f80dda163415178cb5e2797a676f1f966
-rw-r--r-- 1771 Makefile
-rwxr-xr-x 289572 gitk
drwxr-xr-x - po