git-merge-ours: make it a builtin.
[git] / contrib / completion /
drwxr-xr-x   ..
-rwxr-xr-x 25767 git-completion.bash