diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
[git] / gitk-git /
drwxr-xr-x   ..
-rw-r--r-- 1771 Makefile
-rw-r--r-- 321995 gitk
drwxr-xr-x - po