merge-recursive: Provide more info in conflict markers with file renames
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: 3c217c077a86)
-rw-r--r-- 1771 Makefile
-rwxr-xr-x 324172 gitk
drwxr-xr-x - po