DiffEditor: Fix test

* Add trailing newline
* Fix offset by 1 for line numbers
* Swap expected and actual result
* Join short lines

Change-Id: Ia1c618e5fc86dc16956176241205a2108a1ba3e4
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>