merge-recursive: Small cleanups for conflict_rename_rename_1to2
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: a99b7f2256ebd2d1db59c578f3da003e36f259c4)
-rw-r--r-- 1771 Makefile
-rwxr-xr-x 324172 gitk
drwxr-xr-x - po