Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern...
[git] / contrib / workdir /
drwxr-xr-x   ..
-rwxr-xr-x 2402 git-new-workdir