Igor IgorInger
IgorInger
/ diffmerge-diff.sh
Created
February 21, 2012 23:43
— forked from ecerulm/diffmerge-diff.sh
Cygwin Git: wrappers for diffmerge and winmerge. http://rubenlaguna.com/wp/2010/08/05/visual-difftool-cygwin-git/
This file contains hidden or 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 |