Wiktionary
diffing
vb. (present participle of diff English)
vb. (present participle of diff English)