merge: document return values of manifestmerge() and calculateupdates()
In future patches, I want to add one more return value which represents
information which needs to stored and used at commit time.
Differential Revision: https://phab.mercurial-scm.org/D8741
from __future__ import absolute_import
import hashlib
try:
from ..thirdparty import sha1dc
sha1 = sha1dc.sha1
except (ImportError, AttributeError):
sha1 = hashlib.sha1