Marks wrong lines on diff3 without base content

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom

https://atom.io/packages/merge-conflicts

MIT License

432 stars 42 forks source link

Marks wrong lines on diff3 without base content #225

Closed ypresto closed 8 years ago

ypresto commented 8 years ago

<<<<<<< Updated upstream
    private static final int INDICATOR_ANIMATION_DURATION_MILLIS = 150;
||||||| merged common ancestors
=======
    private static final int MAX_SCROLL_DISTANCE = 6;
>>>>>>> Stashed changes

will cause bug...

smashwilson commented 8 years ago

Just verified that this works properly in 1.4.2:

screen shot 2016-04-25 at 3 02 59 pm

ypresto commented 8 years ago

Thanks..!!!