blame: allow "blame file" in the middle of a conflicted merge
[git] / t / t4034 / perl /
drwxr-xr-x   ..
-rw-r--r-- 372 expect
-rw-r--r-- 234 post
-rw-r--r-- 202 pre