Windows visual diff and merge for files and directories
WinMerge is a Windows tool for visual difference display and merging, for both files and directories. It is highly useful for determining what has changed between file versions, and then merging those changes. WinMerge has Unicode support, Flexible syntax coloring editor, Visual SourceSafe integration, and Windows Shell integration. Regexp filtering for filenames and lines. Side-by-side line difference and highlights differences inside lines. A file map shows the overall file differences in a location pane. The user interface is translated into several languages.
A toolkit to make working with Git more intuitive
Git Extensions is a toolkit aimed at making working with Git on Windows more intuitive. Git Extensions is also available on Linux and Mac OS X using Mono. The shell extension will integrate in Windows Explorer and presents a context menu on files and directories. There is also a Visual Studio plugin to use Git from the Visual Studio IDE. There are video tutorials for some basic functions on YouTube and links for the Git Extensions download page, source code, and documentation here: * YouTube tutorials: https://git-extensions-documentation.readthedocs.org/en/latest/git_extensions.html#video-tutorials * Git Extensions download page, source code, and documentation: https://git-extensions-documentation.readthedocs.org/en/latest/git_extensions.html#links