Use diff3 for showing diff

[simonech]

How can I set VSCode to use diff3 as merge/diff algorithm instead of normal diff?

If I show diff in VSCode I have

while if I do it from the command line after having configured diff3 as merge tool git config --global merge.conflictstyle diff3 and having specified that I want *.cs -text diff=csharp I get:

Is it possible to have the same "semantic" diff behaviour also in VSCode?

[chrmarti]

In VSCode's diff editor, you can switch to 'inline' view by clicking on the '...' in the top right corner of the editor and then choosing 'Switch to Inline View'. Does that address your request?

[simonech]

Nope...
I meant that VS Code shows the following as added

        }

        private string SayHello()
        {
            return "Hello";

Using diff3 specifying the csharp language you get

        private string SayHello()
        {
            return "Hello";
        }

[joaomoreno]

I take this as a feature request for our diff algorithm.

[simonech]

So, VSCode is not just getting the diff from git, but it's aoolying its own diff algorithm. So that's why if I change diff in GIT I don't get it in the git diff view in VS Code.
Makes sense.

Well... would be a good new feature :) Thx for reviewing the request.

[alexdima]

I think this is covered by c8df698 (for #30087)

[simonech]

Yeah, it indeed looks like it might fix the issue.
I'll test again when the July version gets released.
thx