Merge branch 'jk/diff-filespec-cleanup'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"