Merge branch 'sg/fix-versioncmp-with-common-suffix'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"