git-diff3c

words: 2 + 34 = 36
last update: