Include deleted lines in diff
Refactor sorting diff array