cherry-pick/revert: add scissors line on merge conflict
[git] / t / t4020 /
drwxr-xr-x   ..
-rw-r--r-- 116 diff.NUL