# HG changeset patch
# User timeless@mozdev.org
# Date 1345237099 25200
# Node ID a736e1e15e46b8913b1fe375268b55bb15171e6c
# Parent  200340b0fcbed2dd10105fa563697e37ca067c1d
spelling: transaction

diff -r 200340b0fcbe -r a736e1e15e46 mercurial/obsolete.py
--- 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: