Merge branch 'js/ignore-space-at-eol'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"