Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maint
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"