# HG changeset patch # User Matt Harbison # Date 1535597624 14400 # Node ID bc0eb1dc6aaeed79f127541723c7a634b8f819d9 # Parent 57b2a02420cd3b42c757dc91df98435811603e3e filemerge: fix an i18n comment typo diff -r 57b2a02420cd -r bc0eb1dc6aae mercurial/filemerge.py --- 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