diff -r c59647c6694d -r 43c00ca887d1 hgext/transplant.py --- a/hgext/transplant.py Sat Dec 12 09:57:05 2015 -0800 +++ b/hgext/transplant.py Mon Dec 14 18:54:03 2015 -0500 @@ -152,7 +152,7 @@ if pulls: if source != repo: exchange.pull(repo, source.peer(), heads=pulls) - merge.update(repo, pulls[-1], False, False, None) + merge.update(repo, pulls[-1], False, False) p1, p2 = repo.dirstate.parents() pulls = [] @@ -216,7 +216,7 @@ tr.close() if pulls: exchange.pull(repo, source.peer(), heads=pulls) - merge.update(repo, pulls[-1], False, False, None) + merge.update(repo, pulls[-1], False, False) finally: self.saveseries(revmap, merges) self.transplants.write()