Mercurial > evolve
diff tests/test-evolve-content-divergent-corner-cases.t @ 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 | 3b7df91c2ba7 |
| children | eed42a183d46 552efcc2cc30 |
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]