blame: allow "blame file" in the middle of a conflicted merge
[git] / contrib / diffall /
drwxr-xr-x   ..
-rw-r--r-- 1286 README
-rwxr-xr-x 5698 git-diffall