changeset 22822 | 7a06ad9518c0 |
parent 22673 | 16a46003b50c |
child 22841 | 18b3869179f9 |
--- a/mercurial/merge.py Tue Oct 07 00:33:47 2014 -0700 +++ b/mercurial/merge.py Tue Oct 07 00:41:58 2014 -0700 @@ -1041,7 +1041,7 @@ # get the max revision for the given successors set, # i.e. the 'tip' of a set - node = repo.revs("max(%ln)", successors)[0] + node = repo.revs("max(%ln)", successors).first() pas = [p1] overwrite = force and not branchmerge