Merge branch 'bw/push-options-recursively-to-submodules' into next
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"