[PATCH] filemerge: fix an i18n comment typo

Matt Harbison mharbison72 at gmail.com
Thu Aug 30 03:01:43 UTC 2018


# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1535597624 14400
#      Wed Aug 29 22:53:44 2018 -0400
# Node ID 6827d3f47d4f1bab01a0cc92d7d9bfc52ee9f535
# Parent  8ff329f68f9a1b11eb877eafc4a539dce7096199
filemerge: fix an i18n comment typo

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -998,7 +998,7 @@ def loadinternalmerge(ui, extname, regis
 
     # to put i18n comments into hg.pot for automatically generated texts
 
-    # i18n: "binary" and "symlik" are keywords
+    # i18n: "binary" and "symlink" are keywords
     # i18n: this text is added automatically
     _("    (actual capabilities: binary, symlink)")
     # i18n: "binary" is keyword


More information about the Mercurial-devel mailing list