Clarify kind of conflict in merge-one-file helper
[gitweb.git] / contrib / gitview /
drwxr-xr-x   parent (dest: contrib; base: adfd55d51bff3bfcf17c3cd40d0689fb018c14cf)
-rwxr-xr-x 38464 gitview
-rw-r--r-- 827 gitview.txt