Comment 1 for bug 1883367

Interestingly the script is called is also called for for conflicting files where the automatic conflict resolution works. This produces extra noise.

So I think we need to stop reformatting merge commits.