cherry-pick/revert: add scissors line on merge conflict
[gitweb.git] / t / t4211 /
drwxr-xr-x   parent (dest: t; base: 1a2b985fb375e7ce14932bfc59365024af2fb6ab)
-rw-r--r-- 795 expect.beginning-of-file
-rw-r--r-- 1177 expect.end-of-file
-rw-r--r-- 1202 expect.move-support-f
-rw-r--r-- 1661 expect.multiple
-rw-r--r-- 2510 expect.multiple-overlapping
-rw-r--r-- 2510 expect.multiple-superset
-rw-r--r-- 2282 expect.parallel-change-f-to-main
-rw-r--r-- 887 expect.simple-f
-rw-r--r-- 1331 expect.simple-f-to-main
-rw-r--r-- 1206 expect.simple-main
-rw-r--r-- 1241 expect.simple-main-to-end
-rw-r--r-- 1626 expect.two-ranges
-rw-r--r-- 773 expect.vanishes-early
-rw-r--r-- 5213 history.export