test: remove changes preparing the drop of `HGMERGE`
These changes are no longer necessary so we better drop them.
--- a/tests/test-largefiles-update.t Thu Nov 01 14:29:21 2018 +0100
+++ b/tests/test-largefiles-update.t Thu Nov 01 14:35:18 2018 +0100
@@ -3,7 +3,6 @@
This file focuses mainly on updating largefiles in the working
directory (and ".hg/largefiles/dirstate")
- $ unset HGMERGE
$ cat >> $HGRCPATH <<EOF
> [ui]
> merge = internal:merge
--- a/tests/test-lfconvert.t Thu Nov 01 14:29:21 2018 +0100
+++ b/tests/test-lfconvert.t Thu Nov 01 14:35:18 2018 +0100
@@ -124,7 +124,7 @@
created new head
$ hg rm large normal3
$ hg commit -q -m"remove large, normal3"
- $ HGMERGE= hg merge --config ui.merge=internal:merge
+ $ hg 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
--- a/tests/test-merge-types.t Thu Nov 01 14:29:21 2018 +0100
+++ b/tests/test-merge-types.t Thu Nov 01 14:35:18 2018 +0100
@@ -1,10 +1,5 @@
#require symlink execbit
- $ unset HGMERGE
- $ cat >> $HGRCPATH << EOF
- > [ui]
- > merge=:merge
- > EOF
$ tellmeabout() {
> if [ -h $1 ]; then
> echo $1 is a symlink:
@@ -41,7 +36,7 @@
ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c
preserving a for resolve of a
a: versions differ -> m (premerge)
- tool :merge (for pattern a) can't handle symlinks
+ tool internal:merge (for pattern a) can't handle symlinks
couldn't find merge tool hgmerge
no tool found to merge a
picked tool ':prompt' for a (binary False symlink True changedelete False)
@@ -212,7 +207,7 @@
$ ln -s base f
$ hg ci -qm2
$ hg merge
- tool :merge (for pattern f) can't handle symlinks
+ tool internal:merge (for pattern f) can't handle symlinks
no tool found to merge f
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -224,7 +219,7 @@
$ hg up -Cqr1
$ hg merge
- tool :merge (for pattern f) can't handle symlinks
+ tool internal:merge (for pattern f) can't handle symlinks
no tool found to merge f
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -251,7 +246,7 @@
$ ln -s dangling f
$ hg ci -qm2
$ hg merge
- tool :merge (for pattern f) can't handle symlinks
+ tool internal:merge (for pattern f) can't handle symlinks
no tool found to merge f
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -263,7 +258,7 @@
$ hg up -Cqr1
$ hg merge
- tool :merge (for pattern f) can't handle symlinks
+ tool internal:merge (for pattern f) can't handle symlinks
no tool found to merge f
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -346,13 +341,13 @@
merging b
merging bx
warning: cannot merge flags for c without common ancestor - keeping local flags
- tool :merge (for pattern d) can't handle symlinks
+ tool internal:merge (for pattern d) can't handle symlinks
no tool found to merge d
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for d? u
- tool :merge (for pattern f) can't handle symlinks
+ tool internal:merge (for pattern f) can't handle symlinks
no tool found to merge f
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u
- tool :merge (for pattern h) can't handle symlinks
+ tool internal:merge (for pattern h) can't handle symlinks
no tool found to merge h
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for h? u
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
@@ -408,13 +403,13 @@
merging b
merging bx
warning: cannot merge flags for c without common ancestor - keeping local flags
- tool :merge (for pattern d) can't handle symlinks
+ tool internal:merge (for pattern d) can't handle symlinks
no tool found to merge d
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for d? u
- tool :merge (for pattern f) can't handle symlinks
+ tool internal:merge (for pattern f) can't handle symlinks
no tool found to merge f
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u
- tool :merge (for pattern h) can't handle symlinks
+ tool internal:merge (for pattern h) can't handle symlinks
no tool found to merge h
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for h? u
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')