Merge branch 'sy/i18n' of git-gui
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"