Merge branch 'fc/rerere-conflict-style' into maint
[gitweb.git] / t / t4034 / pascal /
drwxr-xr-x   parent (dest: t/t4034; base: ada8710e634b4f9f686bd0477bd92b272ec60801)
-rw-r--r-- 2045 expect
-rw-r--r-- 238 post
-rw-r--r-- 232 pre