Merge branch 'tr/test-commit-only-on-orphan' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"