change color of diff of deleted line
Stop auto new line
Correct DirDiff
Merge branch 'develop'