--- a/tests/test-largefiles-update.t	Fri Apr 20 18:08:54 2018 +0200
+++ b/tests/test-largefiles-update.t	Wed Oct 31 18:43:56 2018 +0100
@@ -3,9 +3,10 @@
 This file focuses mainly on updating largefiles in the working
 directory (and ".hg/largefiles/dirstate")
 
+  $ unset HGMERGE
   $ cat >> $HGRCPATH <<EOF
   > [ui]
-  > merge = internal:fail
+  > merge = internal:merge
   > [extensions]
   > largefiles =
   > [extdiff]