Merge branch 'jk/ok-to-fail-gc-auto-in-rebase' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"