Mercurial > hg

changeset 17524:a736e1e15e46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spelling: transaction
author timeless@mozdev.org
date Fri, 17 Aug 2012 13:58:19 -0700
parents 200340b0fcbe
children e327fd6edb14
files mercurial/obsolete.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/obsolete.py	Fri Aug 17 13:58:19 2012 -0700
+++ b/mercurial/obsolete.py	Fri Aug 17 13:58:19 2012 -0700
@@ -224,9 +224,9 @@
             self._load(new)
         return len(new)
 
-    def mergemarkers(self, transation, data):
+    def mergemarkers(self, transaction, data):
         markers = _readmarkers(data)
-        self.add(transation, markers)
+        self.add(transaction, markers)
 
     def _load(self, markers):
         for mark in markers: