Merge branch 'pb/trim-trailing-spaces'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"