--- a/tests/test-issue3084.t Wed Apr 15 11:49:44 2015 -0400
+++ b/tests/test-issue3084.t Wed Apr 15 15:22:16 2015 -0400
@@ -113,8 +113,6 @@
$ echo "l" | hg merge --config ui.interactive=Yes
remote turned local largefile foo into a normal file
keep (l)argefile or use (n)ormal file? l
- getting changed largefiles
- 0 largefiles updated, 0 removed
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -249,8 +247,6 @@
$ hg up -Cqr large
$ hg merge -r normal-id
- getting changed largefiles
- 0 largefiles updated, 0 removed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ cat f
@@ -271,8 +267,6 @@
$ hg up -Cqr large
$ hg merge -r normal-same
- getting changed largefiles
- 0 largefiles updated, 0 removed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ cat f
@@ -307,8 +301,6 @@
$ hg merge -r normal2
remote turned local largefile f into a normal file
keep (l)argefile or use (n)ormal file? l
- getting changed largefiles
- 0 largefiles updated, 0 removed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ cat f
@@ -372,8 +364,6 @@
$ hg merge -r normal
remote turned local largefile f into a normal file
keep (l)argefile or use (n)ormal file? l
- getting changed largefiles
- 0 largefiles updated, 0 removed
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ cat f