Assimilate diff-hl 1.8.7-10-ga625033