Merge pull request scala#9511 from SethTisue/mailmap

SethTisue · web-flow · commit 0870164b0943 · 2021-02-22T09:06:05.000-08:00
update mailmap
diff --git a/.mailmap b/.mailmap
@@ -25,6 +25,7 @@ Damien Obristi <damien.obrist@gmail.com>
 Daniel C. Sobral <dcsobral@gmail.com>
 Daniel C. Sobral <dcsobral@gmail.com> <dcs@dcs-132-CK-NF79.(none)>
 Daniel Lorch <lorch@epfl.ch>
+Darcy Shen <da@tubi.tv>
 Diego E. Alonso Blas <diesalbla@gmail.com>
 Diego E. Alonso Blas <diego.e.a@47deg.com>
 Erik Stenman <stenman@epfl.ch>

-Original file line number
+Diff line change
 Daniel C. Sobral <[email protected]>
 Daniel C. Sobral <[email protected]> <dcs@dcs-132-CK-NF79.(none)>
 Daniel Lorch <[email protected]>
 +Darcy Shen <[email protected]>
 Diego E. Alonso Blas <[email protected]>
 Diego E. Alonso Blas <[email protected]>
 Erik Stenman <[email protected]>