Mercurial > hg
comparison tests/test-rebase-bookmarks.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 | 4441705b7111 |
| children | dc5e5577af39 |
comparison
equal
deleted
inserted
replaced
| 44174:75c2ca094d3a | 44175:2b6632d64328 |
|---|