Merge branch 'jc/grep-commandline-vs-configuration'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"