diff parsing, regardless of diff-prefix choices

diff parsing, regardless of diff-prefix choices #254