equal
deleted
inserted
replaced
34 n 644 7 large1 |
34 n 644 7 large1 |
35 n 644 13 large2 |
35 n 644 13 large2 |
36 $ hg up |
36 $ hg up |
37 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
37 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
38 $ hg debugdirstate --large --nodate |
38 $ hg debugdirstate --large --nodate |
39 n 0 -1 large1 |
39 n 644 7 large1 |
40 n 0 -1 large2 |
40 n 644 13 large2 |
41 BAD: ^^ |
|
42 |
41 |
43 Test that "hg merge" updates largefiles from "other" correctly |
42 Test that "hg merge" updates largefiles from "other" correctly |
44 |
43 |
45 (getting largefiles from "other" normally) |
44 (getting largefiles from "other" normally) |
46 |
45 |