diff -r 1977495dbbe2 -r d4ba4d51f85f mercurial/merge.py
--- a/mercurial/merge.py	Mon Mar 22 15:29:05 2021 -0700
+++ b/mercurial/merge.py	Thu Mar 25 18:02:08 2021 +0100
@@ -1,6 +1,6 @@
 # merge.py - directory-level update/merge handling for Mercurial
 #
-# Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
+# Copyright 2006, 2007 Olivia Mackall <olivia@selenic.com>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.