diff -r 56e15db9109f -r 9d5c27890790 tests/test-largefiles-misc.t --- a/tests/test-largefiles-misc.t Wed Apr 15 11:49:44 2015 -0400 +++ b/tests/test-largefiles-misc.t Wed Apr 15 15:22:16 2015 -0400 @@ -364,8 +364,6 @@ $ hg update -C getting changed largefiles 1 largefiles updated, 0 removed - getting changed largefiles - 0 largefiles updated, 0 removed 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg status -S @@ -805,8 +803,6 @@ R d1/f $ hg merge merging d2/f and d1/f to d2/f - getting changed largefiles - 0 largefiles updated, 0 removed 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ cd ..