Merge branch 'jk/diff-submodule-diff-inline'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"