t6042: add testcase covering rename/add/delete conflict type
[gitweb.git] / t / t7505 /
drwxr-xr-x   parent (dest: t; base: 11d9ade10e50848b10107d281fcfafb785bfb112)
-rw-r--r-- 535 expected-rebase-i
-rw-r--r-- 570 expected-rebase-p