Mercurial > hg

comparison tests/test-merge7.t @ 45916:fa87536d3d70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: raise StateError when there are unresolves merge conflicts Differential Revision: https://phab.mercurial-scm.org/D9392
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 23 Nov 2020 16:48:13 -0800
parents 91a0bc50b288
children 69429972ff1f
comparison
equal deleted inserted replaced
45915:8f50dc096cf4 45916:fa87536d3d70