Mercurial > hg
diff tests/test-update-branches.t @ 44409:f935b680860d
commit: error out on unresolved files even if commit would be empty
Differential Revision: https://phab.mercurial-scm.org/D8195
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 28 Feb 2020 10:30:18 -0800 |
| parents | 6cf92d6c0ad5 |
| children | 1e508097f570 |
line wrap: on
line diff
--- a/tests/test-update-branches.t Fri Feb 28 10:49:13 2020 -0800 +++ b/tests/test-update-branches.t Fri Feb 28 10:30:18 2020 -0800 @@ -347,8 +347,8 @@ $ hg revert -r . a $ rm a.orig $ hg ci -m empty - nothing changed - [1] + abort: unresolved merge conflicts (see 'hg help resolve') + [255] $ hg resolve -m a (no more unresolved files) $ hg resolve -l