Fix diff parsing and display