Mercurial > hg

diff tests/test-rebase-conflicts.t @ 45917:721f765a34ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: raise StateError on uncommitted changes when merge starts Differential Revision: https://phab.mercurial-scm.org/D9393
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 23 Nov 2020 23:08:58 -0800
parents fa87536d3d70
children 3e91d9978bec d6fa9fbd375d
line wrap: on
line diff