changeset 48366 | 8e855e9984a6 |
parent 45771 | f90a5c211251 |
child 50725 | 7e5be4a7cda7 |
--- a/tests/test-narrow-rebase.t Fri Nov 19 15:38:36 2021 -0800 +++ b/tests/test-narrow-rebase.t Fri Nov 19 15:39:35 2021 -0800 @@ -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]