code_review: PR #2070

- `Commands.DiffConflictStage` and `Commands.QueryConflictContent` are never used
- Remove unnecessary attributes of `Views.MergeConflictEditor`
- New line-background render for conflict editor

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger