Merge branch 'mm/push-force-is-dangerous' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"