Mercurial > hg
diff tests/test-narrow-merge.t @ 48366:8e855e9984a6
errors: use detailed exit code when trying to merge file outside narrowspec
Differential Revision: https://phab.mercurial-scm.org/D11827
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 19 Nov 2021 15:39:35 -0800 |
| parents | dc01484606da |
| children | f1eb77dceb36 |
line wrap: on
line diff
--- a/tests/test-narrow-merge.t Fri Nov 19 15:38:36 2021 -0800 +++ b/tests/test-narrow-merge.t Fri Nov 19 15:39:35 2021 -0800 @@ -101,4 +101,4 @@ $ hg merge 'desc("conflicting outside/f1")' abort: conflict in file 'outside/f1' is outside narrow clone (flat !) abort: conflict in file 'outside/' is outside narrow clone (tree !) - [255] + [20]