merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / contrib / workdir /
drwxr-xr-x   parent (dest: contrib; base: b541248)
-rwxr-xr-x 1892 git-new-workdir