cherry-pick/revert: add scissors line on merge conflict
[git] / t / t7505 /
drwxr-xr-x   ..
-rw-r--r-- 535 expected-rebase-i
-rw-r--r-- 570 expected-rebase-p