Mercurial > hg
comparison .clang-format @ 44215:b1069b369d6e
mergestate: add accessors for local and other nodeid, not just contexts
The mergestate can contain invalid nodeids. In that case,
`mergestate.localctx` or `mergestate.otherctx` will fail. This patch
provides a way of accessing the nodeid without failing in such cases.
Differential Revision: https://phab.mercurial-scm.org/D8040
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 29 Jan 2020 11:30:16 -0800 |
parents | d0a3fa849cb8 |
children |
comparison
equal
deleted
inserted
replaced
44214:3d2de64c49d2 | 44215:b1069b369d6e |
---|