Alpha: Rewrite makePrettyDiff function

Add test case current function doesn't satisfy
Rewrite and simplify function

Change-Id: Iedf7643307247b6672ee63351dbd58a7431e98cc
Merge "Alpha: Rewrite makePrettyDiff function"