Merge branch 'nd/gitignore-trailing-whitespace'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"