git-merge documentation: describe how conflict is presented
[gitweb.git] / contrib / gitview /
drwxr-xr-x   parent (dest: contrib; base: 70a3f89733a4cd21631690ba980598fea2249067)
-rwxr-xr-x 38464 gitview
-rw-r--r-- 827 gitview.txt