git-merge-ours: make it a builtin.
[git] / contrib / workdir /
drwxr-xr-x   ..
-rwxr-xr-x 1888 git-new-workdir