Merge branch 'da/mergetool-delete-delete-conflict'
[gitweb.git] / t / t4020 /
drwxr-xr-x   parent (dest: t; base: e094194f08c3d7f3d9ea1714d34ee20ba82f6851)
-rw-r--r-- 116 diff.NUL