502         raise util.Abort(_("outstanding uncommitted merges"))

   502         raise util.Abort(_("outstanding uncommitted merges"))

   503     if pa == p1 or pa == p2: # is there a linear path from p1 to p2?

   503     if pa == p1 or pa == p2: # is there a linear path from p1 to p2?

   504         if branchmerge:

   504         if branchmerge:

   505             if p1.branch() != p2.branch():

   505             if p1.branch() != p2.branch():

   506                 fastforward = True

   506                 fastforward = True

   508             else:

   507             else:

   509                 raise util.Abort(_("there is nothing to merge, just use "

   508                 raise util.Abort(_("there is nothing to merge, just use "

   510                                    "'hg update' or look at 'hg heads'"))

   509                                    "'hg update' or look at 'hg heads'"))

   511     elif not (overwrite or branchmerge):

   510     elif not (overwrite or branchmerge):

   512         raise util.Abort(_("update spans branches, use 'hg merge' "

   511         raise util.Abort(_("update spans branches, use 'hg merge' "