From 1ba42f69ee5559a23cd8fd3a5ae6b0cdb128fde4 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 8 Feb 2024 12:08:37 -0500
Subject: [PATCH] Update `.mailmap` (#7578)

This PR updates the `.mailmap` file to merge some commit authors using
multiple emails.

Release Notes:

- N/A
---
 .mailmap | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.mailmap b/.mailmap
index ec1f3c1f16..fbd23aa5db 100644
--- a/.mailmap
+++ b/.mailmap
@@ -13,6 +13,8 @@ Antonio Scandurra <me@as-cii.com>
 Antonio Scandurra <me@as-cii.com> <antonio@zed.dev>
 Conrad Irwin <conrad@zed.dev>
 Conrad Irwin <conrad@zed.dev> <conrad.irwin@gmail.com>
+Greg Morenz <greg-morenz@droid.cafe>
+Greg Morenz <greg-morenz@droid.cafe> <morenzg@gmail.com>
 Joseph T. Lyons <JosephTLyons@gmail.com>
 Joseph T. Lyons <JosephTLyons@gmail.com> <JosephTLyons@users.noreply.github.com>
 Julia <floc@unpromptedtirade.com>
@@ -39,6 +41,8 @@ Nathan Sobo <nathan@zed.dev> <nathan@warp.dev>
 Nathan Sobo <nathan@zed.dev> <nathansobo@gmail.com>
 Piotr Osiewicz <piotr@zed.dev>
 Piotr Osiewicz <piotr@zed.dev> <24362066+osiewicz@users.noreply.github.com>
+Robert Clover <git@clo4.net>
+Robert Clover <git@clo4.net> <robert@clover.gdn>
 Thorsten Ball <thorsten@zed.dev>
 Thorsten Ball <thorsten@zed.dev> <me@thorstenball.com>
 Thorsten Ball <thorsten@zed.dev> <mrnugget@gmail.com>