Use DiffOutput module from Diff library (>0.3.0)

I've enhanced your multi line diff code and actually merged it inside the Diff library.