Merge branch 'gp/status-rebase-i-info'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"