Merge branch 'so/rebase-doc'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"