[merge addon] Add diff_match_patch as explicit dependency

Closes #2783