Merge branch 'dk/format-patch-ignore-diff-submodule'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"