166     if rev and node:

   166     if rev and node:

   167         raise util.Abort(_("please specify just one revision"))

   167         raise util.Abort(_("please specify just one revision"))

   168 

   168 

   169     if not rev:

   169     if not rev:

   170         rev = node

   170         rev = node

   171 

   174 

   172     cmdutil.bail_if_changed(repo)

   175     cmdutil.bail_if_changed(repo)

   173     op1, op2 = repo.dirstate.parents()

   176     op1, op2 = repo.dirstate.parents()

   174     if op2 != nullid:

   177     if op2 != nullid:

   175         raise util.Abort(_('outstanding uncommitted merge'))

   178         raise util.Abort(_('outstanding uncommitted merge'))