cherry-pick/revert: add scissors line on merge conflict
[git] / t / t4256 / 1 /
drwxr-xr-x   ..
-rw-r--r-- 28374 mailinfo.c
-rw-r--r-- 26987 mailinfo.c.orig
-rw-r--r-- 3381 patch