diff --git a/rbtools/diffs/tools/backends/gnu.py b/rbtools/diffs/tools/backends/gnu.py index 7eaeb127..1294ec22 100644 --- a/rbtools/diffs/tools/backends/gnu.py +++ b/rbtools/diffs/tools/backends/gnu.py @@ -281,6 +281,15 @@ def _iter_diff_paths(self) -> Iterator[str]: for git_path in iter_exes_in_path('git') ) + # Visual Studio 2022 ships a copy of GNU Diff for it's git implementation. Try looking for it. + for edition in ('Community', 'Professional'): + yield os.path.join( + r'C:\Program Files\Microsoft Visual Studio\2022', + edition, + r'Common7\IDE\CommonExtensions\Microsoft\TeamFoundation' + r'\Team Explorer\Git\usr\bin\diff.exe' + ) + # Unity ships GNU diff (or it does at the time of this writing). # Try it. #