merge-tree: fix typo in "both changed identically"
[git] / contrib / workdir /
drwxr-xr-x   ..
-rwxr-xr-x 1886 git-new-workdir