blame: allow "blame file" in the middle of a conflicted merge