diff tests/test-evolve-content-divergent-corner-cases.t @ 5758:552efcc2cc30 mercurial-5.5

test-compat: merge mercurial-5.6 into mercurial-5.5

# no-check-commit

--- a/tests/test-evolve-content-divergent-corner-cases.t	Fri Jan 29 17:23:31 2021 +0800
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Sat Jan 30 20:32:38 2021 +0800
@@ -236,10 +236,10 @@
 
   $ cat >$TESTTMP/test_extension.py  << EOF
   > from mercurial import merge
-  > origupdate = merge._update
+  > origupdate = merge.update
   > def newupdate(*args, **kwargs):
   >   return origupdate(*args, **kwargs)
-  > merge._update = newupdate
+  > merge.update = newupdate
   > EOF
   $ cat >> $HGRCPATH << EOF
   > [extensions]