Jake Harr jakar
jakar
/ git-mergetool-kdiff3noauto
Created
January 27, 2014 18:19
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
| [merge] | |
| tool = kdiff3noauto | |
| [mergetool "kdiff3noauto"] | |
| trustexitcode = false | |
| cmd = kdiff3 \ | |
| --L1 "$MERGED (Base)" --L2 "$MERGED (Local)" --L3 "$MERGED (Remote)" \ | |
| -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" |
jakar
/ gist:3372724
Created
August 16, 2012 19:07
vim: set wildignorecase (comment on http://stackoverflow.com/a/4780444/320418)
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
| if exists("&wildignorecase") | |
| set wildignorecase | |
| endif |