Merge branch 'gp/describe-match-uses-glob-pattern'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"