comparison mercurial/commands.py @ 20871:e01cff65f4c5 stable

backout: document return code of merge conflict

20869:9658a79968c6

      cancel the merge and leave the child of REV as a head to be
      merged separately.

    See :hg:`help dates` for a list of formats valid for -d/--date.

    Returns 0 on success.
    '''
    if rev and node:
        raise util.Abort(_("please specify just one revision"))

    if not rev:

20871:e01cff65f4c5

      cancel the merge and leave the child of REV as a head to be
      merged separately.

    See :hg:`help dates` for a list of formats valid for -d/--date.

    Returns 0 on success, 1 if there are unresolved files.
    '''
    if rev and node:
        raise util.Abort(_("please specify just one revision"))

    if not rev: