A second mailmap attempt.

garth-wells · garth-wells · commit 337a25f8abe8 · 2018-04-16T12:05:36.000+01:00
diff --git a/.mailmap b/.mailmap
@@ -96,10 +96,10 @@ Marie E. Rognes <meg@simula.no> <meg@math.uio.no>
 Marie E. Rognes <meg@simula.no> <meg@meg-laptop>
 Marie E. Rognes <meg@simula.no> Marie E. Rognes (meg@simula.no) <Marie E. Rognes (meg@simula.no)>
 Marie E. Rognes <meg@simula.no> meg@simula.no <>
+Martin Sandve Alnæs <martin.alnes@gmail.com> <martinal@simula.no>
 Martin Sandve Alnæs <martin.alnes@gmail.com>
-Martin Sandve Alnæs <martinal@simula.no>
-Martin Sandve Alnæs <martinal@simula.no> <martinal@localhost>
-Martin Sandve Alnæs <martinal@simula.no> <martinal@martinal-desktop>
+Martin Sandve Alnæs <martin.alnes@gmail.com> <martinal@localhost>
+Martin Sandve Alnæs <martin.alnes@gmail.com> <martinal@martinal-desktop>
 Michele Zaffalon <michele.zaffalon@gmail.com>
 Mikael Mortensen <mikaem@math.uio.no>
 Mikael Mortensen <mikaem@math.uio.no> <mikael.mortensen@gmail.com>

-Original file line number
+Diff line change
 Marie E. Rognes <[email protected]> <meg@meg-laptop>
 Marie E. Rognes <[email protected]> Marie E. Rognes ([email protected]) <Marie E. Rognes ([email protected])>
 Marie E. Rognes <[email protected]> [email protected] <>
 +Martin Sandve Alnæs <[email protected]> <[email protected]>
 Martin Sandve Alnæs <[email protected]>
 -Martin Sandve Alnæs <[email protected]>
 -Martin Sandve Alnæs <[email protected]> <martinal@localhost>
 -Martin Sandve Alnæs <[email protected]> <martinal@martinal-desktop>
 +Martin Sandve Alnæs <[email protected]> <martinal@localhost>
 +Martin Sandve Alnæs <[email protected]> <martinal@martinal-desktop>
 Michele Zaffalon <[email protected]>
 Mikael Mortensen <[email protected]>
 Mikael Mortensen <[email protected]> <[email protected]>