meta: consolidate AUTHORS entries for evantorrie

Trott · targos · commit e2c9e1ccdd57 · 2021-11-04T11:22:38.000+01:00
Add a .mailmap entry for evantorrie to consolidate their two AUTHORS entries into one. PR-URL: #40430 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
diff --git a/.mailmap b/.mailmap
@@ -132,6 +132,7 @@ EungJun Yi <semtlenori@gmail.com>
 Evan Larkin <evan.larkin.il.com> <evan.larkin.iit@gmail.com>
 Evan Lucas <evanlucas@me.com> <evan.lucas@help.com>
 Evan Lucas <evanlucas@me.com> <evan@btc.com>
+Evan Torrie <evan.torrie@yahoo.com> <evant@yahoo-inc.com>
 FangDun Cai <cfddream@gmail.com>
 Fangshi He <hefangshi@gmail.com>
 Farid Neshat <FaridN_SOAD@yahoo.com>
diff --git a/AUTHORS b/AUTHORS
@@ -1332,7 +1332,6 @@ Benedikt Meurer <bmeurer@google.com>
 Kai Cataldo <kaicataldo@gmail.com>
 Victor Felder <victor@draft.li>
 Yann Pringault <yann@cinq-s.com>
-Evan Torrie <evant@yahoo-inc.com>
 Michael Lefkowitz <lefkowitz.michael@gmail.com>
 Viktor Karpov <viktor.s.karpov@gmail.com>
 Lukasz Gasior <lukasz@gasior.net.pl>

-Original file line number
+Diff line change
 Evan Larkin <evan.larkin.il.com> <[email protected]>
 Evan Lucas <[email protected]> <[email protected]>
 Evan Lucas <[email protected]> <[email protected]>
 +Evan Torrie <[email protected]> <[email protected]>
 FangDun Cai <[email protected]>
 Fangshi He <[email protected]>
 Farid Neshat <[email protected]>
-Original file line number
+Diff line change
 Kai Cataldo <[email protected]>
 Victor Felder <[email protected]>
 Yann Pringault <[email protected]>
 -Evan Torrie <[email protected]>
 Michael Lefkowitz <[email protected]>
 Viktor Karpov <[email protected]>
 Lukasz Gasior <[email protected]>