merge-recursive: new function for better colliding conflict resolutions
[gitweb.git] / contrib / completion /
drwxr-xr-x   parent (dest: contrib; base: 37b65ce36bc8f79b5e8cf6f3addf586bd72f3352)
-rw-r--r-- 64896 git-completion.bash
-rw-r--r-- 4801 git-completion.tcsh
-rw-r--r-- 6019 git-completion.zsh
-rw-r--r-- 16379 git-prompt.sh