merge & sequencer: turn "Conflicts:" hint into a comment
[gitweb.git] / contrib / diffall /
drwxr-xr-x   parent (dest: contrib; base: 261f315b)
-rw-r--r-- 1286 README
-rwxr-xr-x 5698 git-diffall