changeset 15777 | 12309c09d19a |
parent 15742 | 65df60a3f96b |
child 15801 | bfd3ce759682 |
--- a/hgext/rebase.py Thu Jan 05 14:14:12 2012 -0600 +++ b/hgext/rebase.py Thu Jan 05 20:35:10 2012 -0600 @@ -269,7 +269,7 @@ 'resolve, then hg rebase --continue)')) finally: ui.setconfig('ui', 'forcemerge', '') - cmdutil.duplicatecopies(repo, rev, target, p2) + cmdutil.duplicatecopies(repo, rev, target) if not collapsef: newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn, editor=editor)