Merge branch 'sb/pull-rebase-submodule'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"