Avy's upstream and its version in elpa.git diverged

[monnier]

% make fetch/avy
emacs --no-site-lisp --batch -l admin/elpa-admin.el -f elpaa-batch-fetch-and-show "avy"
Fetching updates for avy...
Upstream of avy has DIVERGED!

  Local changes:
Depuis https://github.com/abo-abo/avy
 * [nouvelle référence]               -> upstream/avy/main
c4adda8ca5  [email protected]..  * avy/targets/checkdoc.el, ivy/doc/scripts.el: copyright tweak
6537ba305c  ohwoeowho@gmai..  .dir-locals.el: Suggest common-lisp-indent-function
6cbbf1e41d  [email protected]   .dir-locals.el: Enforce sentence-end-double-space
ecb9e4b0ae  [email protected]  Set `outline-regexp' directory local
16ba742299  [email protected]..  Fix some quoting problems in doc strings

  Upstream changes:
[...]

This prevents GNU ELPA from following Avy's development :-( Any chance you could

git fetch git://git.sv.gnu.org/emacs/elpa.git externals/avy
git merge c4adda8ca5

Feel free to undo any part of the changes you disagree with: the important part is the metadata.