Merge branch 'jc/mergetool-tool-help'
[git] / contrib / completion /
drwxr-xr-x   ..
-rw-r--r-- 49072 git-completion.bash
-rw-r--r-- 8149 git-prompt.sh