merge: handle --ff/--no-ff/--ff-only as a tri-state option
[git] / contrib / workdir /
drwxr-xr-x   ..
-rwxr-xr-x 1886 git-new-workdir