git-revert with conflicts to behave as git-merge with conflicts
[gitweb.git] / contrib / gitview /
drwxr-xr-x   parent (dest: contrib; base: a9cb3c6ecb97c4734423045f47899e03f135d3bd)
-rwxr-xr-x 29816 gitview
-rw-r--r-- 827 gitview.txt