fixed #15: only show the three-way-diff when expectation and file-on-disk differ
fixed a bug when parsing single-line expectations
fixed #13: make comparison editor work on whole file and not just individual XPECT statements