--- a/hgext/rebase.py Mon Apr 04 11:41:54 2011 +0200
+++ b/hgext/rebase.py Mon Apr 04 16:58:24 2011 -0500
@@ -171,7 +171,7 @@
else:
try:
ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
- stats = rebasenode(repo, rev, p1, p2, state)
+ stats = rebasenode(repo, rev, p1, state)
if stats and stats[3] > 0:
raise util.Abort(_('unresolved conflicts (see hg '
'resolve, then hg rebase --continue)'))
@@ -287,7 +287,7 @@
repo.dirstate.invalidate()
raise
-def rebasenode(repo, rev, p1, p2, state):
+def rebasenode(repo, rev, p1, state):
'Rebase a single revision'
# Merge phase
# Update to target and merge it with local