Merge branch 'jn/shell-disable-interactive'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"