Mercurial > hg-stable

diff mercurial/merge.py @ 30342:318a24b52eeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spelling: fixes of non-dictionary words
author Mads Kiilerich <madski@unity3d.com>
date Mon, 17 Oct 2016 23:16:55 +0200
parents a2804ddcf9ae
children 1070df141718
line wrap: on
line diff
--- a/mercurial/merge.py	Thu Nov 03 17:31:14 2016 -0700
+++ b/mercurial/merge.py	Mon Oct 17 23:16:55 2016 +0200
@@ -66,7 +66,7 @@
        (experimental)
     m: the external merge driver defined for this merge plus its run state
        (experimental)
-    f: a (filename, dictonary) tuple of optional values for a given file
+    f: a (filename, dictionary) tuple of optional values for a given file
     X: unsupported mandatory record type (used in tests)
     x: unsupported advisory record type (used in tests)
     l: the labels for the parts of the merge.