blame: allow "blame file" in the middle of a conflicted merge
[git] / t / t5100 / msg0013