Diff fixes
More fixes
Diff fixed
Fixes
Reset replaced lines before removing inserted lines
Try to fix test
Update .travis.yml
Refactor
Refactor diff
Change
Diff should work now