merge overwrites unstaged changes in renamed file
[gitweb.git] / t / t4020 /
drwxr-xr-x   parent (dest: t; base: 30fd3a5425)
-rw-r--r-- 116 diff.NUL