branch | stable |
changeset 23696 | 1265a3a71d75 |
parent 23694 | 97eb62b0f4a9 |
child 23706 | 3314664606e6 |
--- a/tests/test-largefiles-update.t Wed Dec 31 14:46:02 2014 +0100 +++ b/tests/test-largefiles-update.t Wed Dec 31 14:46:03 2014 +0100 @@ -36,9 +36,8 @@ $ hg up 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg debugdirstate --large --nodate - n 0 -1 large1 - n 0 -1 large2 -BAD: ^^ + n 644 7 large1 + n 644 13 large2 Test that "hg merge" updates largefiles from "other" correctly