Merge branch 'mt/rebase-i-keep-empty-test'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"