Merge branch 'ep/shell-assign-and-export-vars'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"