false positive merge conflicts in stash

Radek_6l37aq

I am using 2.8 on my linux workstation. I am re-basing branch, normal procedure, resolved bunch of conflicts and push my new branch after rebase to stash.

Now the problem is that stash shows me conflicts:

1. which do not exist locally on my branch, on local files
2. the conflicted lines looks identical, example below

Charlie Misonne

Any chance the line endings are different?