# HG changeset patch # User Boris Feld <boris.f...@octobus.net> # Date 1541078954 -3600 # Thu Nov 01 14:29:14 2018 +0100 # Node ID 063a0cb2cb31f0071c764035953fb8c3bc9bbdbc # Parent 05fcb3400a879d518b51bb470d9b4517bbbfaa75 # EXP-Topic run-tests # Available At https://bitbucket.org/octobus/mercurial-devel/ # hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 063a0cb2cb31 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. diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t --- a/tests/test-lfconvert.t +++ b/tests/test-lfconvert.t @@ -124,11 +124,11 @@ add some changesets to rename/remove/mer 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] _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
