author | timeless@mozdev.org |
Fri, 17 Aug 2012 13:58:19 -0700 | |
changeset 17524 | a736e1e15e46 |
parent 17523 | 200340b0fcbe |
child 17525 | e327fd6edb14 |
--- 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: