Merge branch 'ak/git-strip-extension-from-dashed-command' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"