Handle merges differently than commits

[kwood]

Currently if you commit a fix into a feature branch, and then later merge that branch into another branch (master, for instance), you get two identical comments linking to the commit.

We should detect that the subsequent messages are results of merges, note that, and link to the merge commit rather than the original.