Rollup merge of rust-lang#148030 - hkBst:patch-3, r=lqd

matthiaskrgr · web-flow · commit 2d07dd572fa7 · 2025-10-23T18:37:02.000+02:00
Add Marijn Schouten to .mailmap Should fix rust-lang/thanks#85
diff --git a/.mailmap b/.mailmap
@@ -427,6 +427,7 @@ Marcell Pardavi <marcell.pardavi@gmail.com>
 Marco Ieni <11428655+MarcoIeni@users.noreply.github.com>
 Marcus Klaas de Vries <mail@marcusklaas.nl>
 Margaret Meyerhofer <mmeyerho@andrew.cmu.edu> <mmeyerho@andrew>
+Marijn Schouten <mhkbst@gmail.com> <hkBst@users.noreply.github.com>
 Mark Mansi <markm@cs.wisc.edu>
 Mark Mansi <markm@cs.wisc.edu> <m.mim95@gmail.com>
 Mark Rousskov <mark.simulacrum@gmail.com>

-Original file line number
+Diff line change
 Marco Ieni <[email protected]>
 Marcus Klaas de Vries <[email protected]>
 Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
 +Marijn Schouten <[email protected]> <[email protected]>
 Mark Mansi <[email protected]>
 Mark Mansi <[email protected]> <[email protected]>
 Mark Rousskov <[email protected]>