Markus Obrist MarkusObrist
MarkusObrist
/ git-mergetool-winmerge-setup.sh
Created
June 6, 2011 13:28
— forked from adilsoncarvalho/git-mergetool-winmerge-setup.sh
shell script that configures git to use WinMerge as the default tool to handle conflicts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/bin/sh | |
| # | |
| # This script will make WinMerge your default tool for diff and merge. | |
| # It must run inside git bash (on Windows) | |
| # | |
| # If your WinMerge is in other place then this one, please edit | |
| WINMERGE_SCRIPT="winmerge-merge.sh" |