diff tests/test-evolve-content-divergent-corner-cases.t @ 5608:d9ee2706487f stable

compat: add support for upstream rename of merge.update() to _update()

The function was renamed in Mercurial commit 2c86b9587740.

--- a/tests/test-evolve-content-divergent-corner-cases.t	Mon Oct 12 12:33:18 2020 +0200
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Fri Sep 25 09:13:57 2020 -0700
@@ -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]