Mercurial > hg
diff tests/test-merge1.t @ 45917:721f765a34ac
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 | 9dc1351d0b5f |
| children | dc00324e80f4 |
line wrap: on
line diff
--- a/tests/test-merge1.t Mon Nov 23 16:48:13 2020 -0800 +++ b/tests/test-merge1.t Mon Nov 23 23:08:58 2020 -0800 @@ -282,7 +282,7 @@ $ hg merge 2 abort: uncommitted changes (use 'hg status' to list changes) - [255] + [20] merge expected! $ hg merge -f 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -319,7 +319,7 @@ $ hg merge 2 abort: uncommitted changes (use 'hg status' to list changes) - [255] + [20] merge of b expected $ hg merge -f 2 merging b