Merge branch 'tk/diffcore-delta-remove-unused' into maint

Code cleanup.

* tk/diffcore-delta-remove-unused:
diffcore-delta: remove unused parameter to diffcore_count_changes()

diff --cc diff.c
Simple merge

diff --cc diffcore-break.c
Simple merge

diff --cc diffcore-rename.c
Simple merge

diff --cc diffcore.h
Simple merge