Merge branch 'en/disable-dir-rename-in-recursive-merge'
[gitweb.git] / t / t7505 /
drwxr-xr-x   parent (dest: t; base: 0bdaec1d3db90d69041531311fb34fa09639589b)
-rw-r--r-- 535 expected-rebase-i
-rw-r--r-- 570 expected-rebase-p