Mercurial > hg

diff tests/test-merge5.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 527ce85c2e60
children 55c6ebd11cb9
line wrap: on
line diff