# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1541007836 -3600
# Node ID 37e75be0b019e359287de734f5c668736a0e4aa5
# Parent  cfa564037789b03bb9012412e81cd72ec7a631cf
tests: adjust merge tool config in test-largefiles-update.t

Previously, the `ui.merge=internal:fail` configuration was shadowed by the the
`HGMERGE=internal:merge` environment variable. We would like to remove this
usage of `HGMERGE` variable because it is error-prone (eg: this very test). We
start by cleaning up test independently to avoid large churn when the change
happens.

diff -r cfa564037789 -r 37e75be0b019 tests/test-largefiles-update.t
--- 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]