merge-recursive: Nuke rename/directory conflict detection
[git] / gitk-git /
drwxr-xr-x   ..
-rw-r--r-- 1771 Makefile
-rw-r--r-- 321995 gitk
drwxr-xr-x - po