# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1604138767 -28800
# Node ID ce6f570918fd16799f597fd9867a5aa46f3b1fb9
# Parent  aea931d59fc0e295e9c5a059d50dac750d2174a9
tests: back out changeset 3b7df91c2ba7

diff -r aea931d59fc0 -r ce6f570918fd tests/test-evolve-content-divergent-corner-cases.t
--- a/tests/test-evolve-content-divergent-corner-cases.t	Sat Oct 31 17:47:08 2020 +0800
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Sat Oct 31 18:06:07 2020 +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]