diff tests/test-revset-outgoing.t @ 44175:2b6632d64328

merge: check that there are no conflicts after --abort Same idea as in abcc82bf0717 (clean: check that there are no conflicts after, 2020-01-24). We should reuse more code here, but that will come later. Differential Revision: https://phab.mercurial-scm.org/D7994
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 24 Jan 2020 16:00:54 -0800
parents 0ebd94ac56d1
children 95c4cca641f6
line wrap: on
line diff