Skip to content

Instantly share code, notes, and snippets.

@adilsoncarvalho
adilsoncarvalho / git-mergetool-winmerge-setup.sh
Created Dec 29, 2010
shell script that configures git to use WinMerge as the default tool to handle conflicts
View git-mergetool-winmerge-setup.sh
#!/bin/sh
#
# This script will make WinMerge your default tool for diff and merge.
# It must run inside git bash (on Windows)
#
#
# If you experience path issues you should give a try to the gist
# created by markusobrist at https://gist.github.com/1010253