meta: add mailmap entry for dmabupt

Trott · danielleadams · commit fd213edda2d4 · 2021-08-16T16:34:51.000-04:00
This consolidates two email addresses/entries in AUTHORS into one. PR-URL: #39596 Reviewed-By: Ujjwal Sharma <ryzokuken@disroot.org> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/.mailmap b/.mailmap
@@ -445,6 +445,7 @@ Wilson Lin <wla80@sfu.ca>
 Wyatt Preul <wpreul@gmail.com>
 Xavier J Ortiz <xavier.ortiz.ch@gmail.com>
 xiaoyu <306766053@qq.com>
+Xu Meng <dmabupt@gmail.com> <mengxumx@cn.ibm.com>
 Yael Hermon <yaelherm@gmail.com> <yaelhe@wix.com>
 ycjcl868 <45808948@qq.com> <chaolinjin@gmail.com>
 Yingchen Xue <yingchenxue@qq.com>
diff --git a/AUTHORS b/AUTHORS
@@ -2793,7 +2793,7 @@ Gabriela Niño <gabynr@gmail.com>
 Mike MacCana <mike.maccana@gmail.com>
 Tim Baverstock <tim.baverstock@corp.badoo.com>
 Walle Cyril <cyril.walle@protonmail.com>
-Xu Meng <mengxumx@cn.ibm.com>
+Xu Meng <dmabupt@gmail.com>
 Samuel Attard <sattard@slack-corp.com>
 Ben L. Titzer <titzer@google.com>
 Ojasvi Monga <ojasvi@Ojasvis-MacBook-Air.local>
@@ -3031,7 +3031,6 @@ Sk Sajidul Kadir <sheikh.sajid522@gmail.com>
 Bartlomiej Brzozowski <bart.brzozowski@janeasystems.com>
 Saajan <saajan.sn@gmail.com>
 Yash Ladha <yashladhapankajladha123@gmail.com>
-Xu Meng <dmabupt@gmail.com>
 Alex R <alexei.rudenko@gmail.com>
 Hachimi Aa (Sfeir) <hachimi.aa@sfeir.com>
 Daniel Estiven Rico Posada <danielrico.posada@gmail.com>

-Original file line number
+Diff line change
 Wyatt Preul <[email protected]>
 Xavier J Ortiz <[email protected]>
 xiaoyu <[email protected]>
 +Xu Meng <[email protected]> <[email protected]>
 Yael Hermon <[email protected]> <[email protected]>
 ycjcl868 <[email protected]> <[email protected]>
 Yingchen Xue <[email protected]>
-Original file line number
+Diff line change
 Mike MacCana <[email protected]>
 Tim Baverstock <[email protected]>
 Walle Cyril <[email protected]>
 -Xu Meng <[email protected].com>
 +Xu Meng <dmabupt@gmail.com>
 Samuel Attard <[email protected]>
 Ben L. Titzer <[email protected]>
 Ojasvi Monga <[email protected]>
 Bartlomiej Brzozowski <[email protected]>
 Saajan <[email protected]>
 Yash Ladha <[email protected]>
 -Xu Meng <[email protected]>
 Alex R <[email protected]>
 Hachimi Aa (Sfeir) <[email protected]>
 Daniel Estiven Rico Posada <[email protected]>