Merge "Add .mailmap"
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..8154169
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Shawn Pearce <[email protected]> Shawn O. Pearce <[email protected]>