Merge branch 'rt/push-recurse-submodule-usage-string'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"