git-blame shouldn't crash if run in an unmerged tree