cherry-pick/revert: add scissors line on merge conflict
[git] / t / t4034 / pascal /
drwxr-xr-x   ..
-rw-r--r-- 2045 expect
-rw-r--r-- 238 post
-rw-r--r-- 232 pre