changeset 39285 | a3fd84f4fb38 |
parent 39284 | 975d959295ef |
child 39480 | 89630d0b3e23 |
--- a/tests/test-largefiles-update.t Sat Aug 25 21:17:34 2018 +0300 +++ b/tests/test-largefiles-update.t Sun Aug 26 19:14:26 2018 +0300 @@ -611,7 +611,7 @@ > EOF rebasing 1:72518492caa6 "#1" rebasing 4:07d6153b5c04 "#4" - file '.hglf/large1' was deleted in local [dest] but was modified in other [source]. + file '.hglf/large1' was deleted in other [source] but was modified in local [dest]. What do you want to do? use (c)hanged version, (d)elete, or leave (u)nresolved? c