changeset 48760 | 93d6f0e7ba2f |
parent 48657 | 68b7faeb6ef3 |
--- a/tests/test-largefiles-misc.t Mon Feb 07 20:12:09 2022 -0800 +++ b/tests/test-largefiles-misc.t Mon Feb 07 22:54:38 2022 -0800 @@ -962,7 +962,7 @@ what do you want to do? l getting changed largefiles 1 largefiles updated, 0 removed - 0 files updated, 4 files merged, 0 files removed, 0 files unresolved + 1 files updated, 3 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ cat f-different 1