Merge branch 'rj/submodule-fsck-skip'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"