Mercurial > public > mercurial-scm > hg

diff mercurial/simplemerge.py @ 30332: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 5f7d13d3bd4d
children 21fa3d3688f3
line wrap: on
line diff
--- a/mercurial/simplemerge.py	Thu Nov 03 17:31:14 2016 -0700
+++ b/mercurial/simplemerge.py	Mon Oct 17 23:16:55 2016 +0200
@@ -274,7 +274,7 @@
     def minimize(self, merge_regions):
         """Trim conflict regions of lines where A and B sides match.
 
-        Lines where both A and B have made the same changes at the begining
+        Lines where both A and B have made the same changes at the beginning
         or the end of each merge region are eliminated from the conflict
         region and are instead considered the same.
         """