P4Merge is an excellent, free diff and merge tool. Perforce Visual Merge and Diff Tools provide a unique perspective into the context in which change happens. | Please install with chocolatey (http://nuget.org/List/Packages/chocolatey).

WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle. | Please install with chocolatey (http://nuget.org/List/Packages/chocolatey).

KDiff3 is a graphical text difference analyzer for up to 3 input files, provides character-by-character analysis and a text merge tool with integrated editor. It can also compare and merge directories. Platform-independant.

Visually compare and merge files within Windows, Mac OS X and Linux.

To configure your Git diff tool, you need a shell script wrapper and a few git config calls. This script does all the hard work for you! Alexander Gross fixed it for baseless diffs. Enjoy... cmd> git difftool [normal-options]

TortoiseMerge is a simple merge tool which is usually bundled with TortoiseSVN

The download url is an unversioned permalink, and hence will always be the latest version, even if the version of this package is not updated. Please see the documentation at http://www.semanticmerge.com/documents/semanticmerge-intro-guide.pdf

ILMerge is a utility that can be used to merge multiple .NET assemblies into a single assembly. ILMerge takes a set of input assemblies and merges them into one target assembly. The first assembly in the list of input assemblies is the primary assembly. When the primary assembly is an executable, then the target assembly is created as an executable... More information

Visual merge and diff tool from Perforce - P4Merge - lets you visualize the differences between file versions. Color coding makes it easy to resolve conflicts that result from parallel or concurrent development. NOTE: Automatic uninstall procedure is included in this package, so you don't need to manually reverse whatever actions installer d... More information

Git settings for Windows by modifying global .gitconfig file. Package is unobtrusive - settings are changed only if they were not set before or have been set to default value. 1. Core editor is set to: Notepad++, Notepad2 or Notepad, in that order, whichever application is detected on a system. 2. Diff and merge tool are set to: P4Merg... More information

Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial. Written with Python and GTK. ... More information

My standard Git aliases aliases = config --get-regexp alias amend = commit --amend bl = blame -w -M -C bra = branch -rav branches = branch -rav changed = status -sb f = !git ls-files | grep -i filelog = log -u hist = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%c... More information

Very simple set of standard Git config on Windows core.autocrlf true core.safecrlf false rebase.autosquash true help.format html push.default simple core.editor Notepad++ diff.tool DiffMerge diff.guitool DiffMerge merge.tool DiffMerge

PowerShell cmdlet helpers for working with the GitHub API. * New-GitHubOAuthToken - creates an OAuth token for use with GitHub * Get-GitHubOAuthTokens - Used to list all the authorizations you have provided to applications / tooling * Set-GitHubUserName - Adds the username to the current PowerShell session and sets a global User environment variab... More information