--- a/tests/test-issue3084.t Fri Dec 05 16:51:37 2014 -0800
+++ b/tests/test-issue3084.t Fri Dec 05 16:45:52 2014 -0800
@@ -42,9 +42,7 @@
$ echo "n" | hg merge --config ui.interactive=Yes
remote turned local normal file foo into a largefile
use (l)argefile or keep (n)ormal file? n
- getting changed largefiles
- 0 largefiles updated, 0 removed
- 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg status
@@ -302,9 +300,7 @@
use (c)hanged version or (d)elete? c
remote turned local normal file f into a largefile
use (l)argefile or keep (n)ormal file? n
- getting changed largefiles
- 0 largefiles updated, 0 removed
- 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ cat f
normal2