Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"