completion: add missing options for git-merge
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 8fee8726470bd63db6c396ea6208ea487eaa8fab)
-rw-r--r-- 5343 README
-rwxr-xr-x 3811 diff-highlight