How to use as diff tool with git in visual studio 2022

[CurtisMoostoos]

We recently switched from TFVC to git at my company. I want to setup my visual studio to use winmerge. How do I do that with git? There is not comparable screen to what I saw in VS for TFVC

[sdottaka]

As far as we could tell, Visual Studio 2022 does not seem to provide a way to invoke an external diff tool for Git.
Instead, Git diffs are always shown using Visual Studio’s built-in diff viewer.

[Gav-Brown]

@CurtisMoostoos For me, I just configure Git to use WinMerge and then Visual Studio uses that.
Add the following to your global .gitconfig file

[diff]
  tool = WinMerge
[difftool "WinMerge"]
  cmd = \"C:/Store/Programs/WinMerge/WinMergeU.exe\" \"$LOCAL\" \"$REMOTE\"

You can check Visual Studio - Options - Source Control - Git Global Settings to see if this has taken affect.

[sdottaka]

@Gav-Brown Thanks for the information.

In my environment, I was able to launch WinMerge from Visual Studio by using the following configuration:

[diff]
tool = WinMerge
[difftool "WinMerge"]
cmd = "C:/Program Files/WinMerge/WinMergeU.exe" -ub "$LOCAL" "$REMOTE"

[Gav-Brown]

@sdottaka Nice. What does the switch -ub do? I can see -u etc. in the help docs (I'll start using this!), but not -ub.

[sdottaka]

@Gav-Brown
-ub behaves the same as -u, but it’s deprecated.
Please use -u instead.