git_remote_helpers / git / __init__.pyon commit blame: allow "blame file" in the middle of a conflicted merge (9aeaab6)
   1