changeset 5627:ce6f570918fd mercurial-5.5

tests: back out changeset 3b7df91c2ba7
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 31 Oct 2020 18:06:07 +0800
parents aea931d59fc0
children bb5c6f62ae28
files tests/test-evolve-content-divergent-corner-cases.t
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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]