Patchwork filemerge: fix an i18n comment typo

login
register
mail settings
Submitter Matt Harbison
Date Aug. 30, 2018, 3:01 a.m.
Message ID <6827d3f47d4f1bab01a0.1535598103@Envy>
Download mbox | patch
Permalink /patch/34177/
State Accepted
Headers show

Comments

Matt Harbison - Aug. 30, 2018, 3:01 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1535597624 14400
#      Wed Aug 29 22:53:44 2018 -0400
# Node ID 6827d3f47d4f1bab01a0cc92d7d9bfc52ee9f535
# Parent  8ff329f68f9a1b11eb877eafc4a539dce7096199
filemerge: fix an i18n comment typo
Yuya Nishihara - Aug. 30, 2018, 11:27 a.m.
On Wed, 29 Aug 2018 23:01:43 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1535597624 14400
> #      Wed Aug 29 22:53:44 2018 -0400
> # Node ID 6827d3f47d4f1bab01a0cc92d7d9bfc52ee9f535
> # Parent  8ff329f68f9a1b11eb877eafc4a539dce7096199
> filemerge: fix an i18n comment typo

Queued, thanks.

Patch

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