update_mailmap: ignore merge commits, consistent with update_authors

Description

See !1982 (comment 704820)

API Changes and Justification

Backwards Compatible Changes

• This change does not modify any class/function/struct/type definitions in a public C header file or any Python class/function definitions
• This change adds new classes/functions/structs/types to a public C header file or Python module

Backwards Incompatible Changes

• This change modifies an existing class/function/struct/type definition in a public C header file or Python module
• This change removes an existing class/function/struct/type from a public C header file or Python module

If any of the Backwards Incompatible check boxes are ticked please provide a justification why this change is necessary and why it needs to be done in a backwards incompatible way.

Review Status

cc @adam-mercer

common/maintainer-scripts/update_mailmap

@@ -22,7 +22,7 @@ while (<IN>) {
 }
 close IN;
 
-open IN, "git log HEAD | git shortlog --summary --email --numbered |" or die $!;
+open IN, "git log --full-history --no-merges HEAD | git shortlog --summary --email --numbered |" or die $!;
 binmode IN, ":encoding(UTF-8)";
 while (<IN>) {
   chomp;