Merge branch 'sg/complete-untracked-filter'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"