comparison docs/troubles-handling.rst @ 5566:3b7df91c2ba7

compat: add support for upstream rename of merge.update() to _update() The function was renamed in Mercurial commit 2c86b9587740.
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 25 Sep 2020 09:13:57 -0700
parents c408a31d8883
children 72a4aa791d97
comparison
equal deleted inserted replaced
5564:0e23393dda9c 5566:3b7df91c2ba7