changeset 40468:1f0c5c9a1765

test: drop usage of `HGMERGE` in `test-lfconvert.t` Using configuration instead of environment variable has a strange effect on the output, but no impact on the end result.
author Boris Feld <boris.feld@octobus.net>
date Thu, 01 Nov 2018 14:29:14 +0100
parents ee17af097257
children f8154ddaaed3
files tests/test-lfconvert.t
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-lfconvert.t	Thu Nov 01 14:26:30 2018 +0100
+++ b/tests/test-lfconvert.t	Thu Nov 01 14:29:14 2018 +0100
@@ -124,11 +124,11 @@
   created new head
   $ hg rm large normal3
   $ hg commit -q -m"remove large, normal3"
-  $ hg merge
-  merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat
+  $ HGMERGE= hg merge --config ui.merge=internal:merge
+  tool internal:merge (for pattern stuff/maybelarge.dat) can't handle binary
+  no tool found to merge stuff/maybelarge.dat
+  keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for stuff/maybelarge.dat? u
   merging sub/normal2 and stuff/normal2 to stuff/normal2
-  warning: stuff/maybelarge.dat looks like a binary file.
-  warning: conflicts while merging stuff/maybelarge.dat! (edit, then use 'hg resolve --mark')
   0 files updated, 1 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]