xdiff-merge: optionally show conflicts in "diff3 -m" style
[git] / contrib / workdir /
drwxr-xr-x   ..
-rwxr-xr-x 1892 git-new-workdir