changeset 23452 | 86c0d8c1484f |
parent 23270 | 41c03b7592ed |
child 23781 | 49caef455912 |
--- a/hgext/transplant.py Tue Nov 18 21:38:19 2014 -0800 +++ b/hgext/transplant.py Tue Nov 18 21:49:05 2014 -0800 @@ -118,7 +118,7 @@ revs = sorted(revmap) p1, p2 = repo.dirstate.parents() pulls = [] - diffopts = patch.diffopts(self.ui, opts) + diffopts = patch.difffeatureopts(self.ui, opts) diffopts.git = True lock = wlock = tr = None