Mercurial > hg-stable

diff hgext/rebase.py @ 15777:12309c09d19a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: simplify duplicatecopies
author Matt Mackall <mpm@selenic.com>
date Thu, 05 Jan 2012 20:35:10 -0600
parents 65df60a3f96b
children bfd3ce759682
line wrap: on
line diff
--- 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)