[WorldMaker]

I already mentioned `git blame --first-parent` just a few comments up! You get the sha1 referencing a commit that has a title like "Merged PR #327". You can dig down deeper than that --first-parent level if need be, but you have the power of the git graph to show/hide details if when you do/do not need them.

[u801e]

Does the --first-parent flag handle the case where the the line was change as part of a conflict resolution in the merge commit itself?