cherry-pick/revert: add scissors line on merge conflict
[git] / contrib / completion /
drwxr-xr-x   ..
-rw-r--r-- 14 .gitattributes
-rw-r--r-- 65584 git-completion.bash
-rw-r--r-- 4801 git-completion.tcsh
-rw-r--r-- 6013 git-completion.zsh
-rw-r--r-- 16379 git-prompt.sh