Show indentation more clearly.
Do word level diff.
Merge conflicts.