--- a/tests/test-largefiles-update.t Fri Oct 13 21:36:10 2017 +0900
+++ b/tests/test-largefiles-update.t Thu Oct 12 09:39:50 2017 +0200
@@ -458,6 +458,7 @@
adding manifests
adding file changes
added 3 changesets with 5 changes to 5 files
+ new changesets 9530e27857f7:d65e59e952a9
remote turned local largefile large2 into a normal file
keep (l)argefile or use (n)ormal file? l
largefile large1 has a merge conflict
@@ -493,6 +494,7 @@
adding manifests
adding file changes
added 3 changesets with 5 changes to 5 files
+ new changesets 9530e27857f7:d65e59e952a9
remote turned local largefile large2 into a normal file
keep (l)argefile or use (n)ormal file? l
largefile large1 has a merge conflict