Merge branch 'tb/complete-word-diff-regex'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"