Mercurial > hg

changeset 39359:bc0eb1dc6aae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: fix an i18n comment typo
author Matt Harbison <matt_harbison@yahoo.com>
date Wed, 29 Aug 2018 22:53:44 -0400
parents 57b2a02420cd
children 570fca90d556
files mercurial/filemerge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/filemerge.py	Mon Aug 27 14:08:18 2018 +0300
+++ b/mercurial/filemerge.py	Wed Aug 29 22:53:44 2018 -0400
@@ -998,7 +998,7 @@
 
     # 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