diff contrib/merge-test-compat.sh @ 5614:24a1ff0677a7 stable

compat: rename update() to _update() to make room for a new update() The next patch will add a `compat.update()` that delegates to the new `merge.update()` from upstream (different from the old one, which was renamed to `merge._update()`).
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 02 Oct 2020 09:51:45 -0700
parents 17fac26833da
children
line wrap: on
line diff