diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
[git] / contrib / workdir /
drwxr-xr-x   ..
-rwxr-xr-x 1889 git-new-workdir