merge-recursive: check for file level conflicts then get new name
[gitweb.git] / contrib / completion /
drwxr-xr-x   parent (dest: contrib; base: f6f775591881036a3c4bfcf6737c9119c251537d)
-rw-r--r-- 69413 git-completion.bash
-rw-r--r-- 4801 git-completion.tcsh
-rw-r--r-- 5886 git-completion.zsh
-rw-r--r-- 16379 git-prompt.sh