"reset --merge": fix unmerged case
[gitweb.git] / t / t4020 /
drwxr-xr-x   parent (dest: t; base: e11d7b5969704cd5ce39d053414d905bb203886b)
-rw-r--r-- 116 diff.NUL