I just fixed a fairly big merge conflict with VS 2015's built-in Git merge conflict resolving thing (i.e. the thing where you see the changes in the base branch at the top left, the changes in the target branch at the top right, and the combined file at the bottom). This involved manually rewriting some lines instead of picking an existing version of them from one of the existing branches. Upon finishing the merge commit, I realised that the lines I'd rewritten now had the wrong indentation type.
This is with the 5.0.0 release, so it's not impossible that it's been resolved in an unreleased build.
I just fixed a fairly big merge conflict with VS 2015's built-in Git merge conflict resolving thing (i.e. the thing where you see the changes in the base branch at the top left, the changes in the target branch at the top right, and the combined file at the bottom). This involved manually rewriting some lines instead of picking an existing version of them from one of the existing branches. Upon finishing the merge commit, I realised that the lines I'd rewritten now had the wrong indentation type.
This is with the 5.0.0 release, so it's not impossible that it's been resolved in an unreleased build.