TechYourChance techyourchance
featheredtoast
/ diffmerge-diff.sh
Created
May 3, 2012 20:17
— forked from ecerulm/diffmerge-diff.sh
Cygwin Git: wrappers for diffmerge, winmerge, and p4merge
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 | |
| # Use SourceGear DiffMerge as mergetool for git in cygwin. | |
| # git config --global mergetool.diffmerge.cmd "diffmergetool.sh \"\$LOCAL\" \"\$REMOTE\" \"\$BASE\" \"\$MERGED\"" | |
| # git config --global mergetool.diffmerge.trustExitCode false | |
| # git difftool -t diffmerge branch1..branch2 | |
| # Reference: http://www.tldp.org/LDP/abs/abs-guide.pdf | |
| library=githelperfunctions.sh |