We now use unified diffs