branch | stable |
changeset 48796 | c00d3ce4e94b |
parent 48366 | 8e855e9984a6 |
child 50725 | 7e5be4a7cda7 |
--- a/tests/test-narrow-rebase.t Fri Feb 18 12:55:39 2022 +0100 +++ b/tests/test-narrow-rebase.t Fri Feb 18 14:27:43 2022 +0100 @@ -96,4 +96,4 @@ $ hg rebase -d 'desc("modify outside/f1")' rebasing 4:707c035aadb6 "conflicting outside/f1" abort: conflict in file 'outside/f1' is outside narrow clone - [255] + [20]