git-merge-recursive: learn to honor merge.conflictstyle
[git] / contrib / workdir /
drwxr-xr-x   ..
-rwxr-xr-x 1892 git-new-workdir