mergetools / gvimdiff2on commit Merge branch 'mm/push-force-is-dangerous' into maint (bd54df0)
   1. "$MERGE_TOOLS_DIR/vimdiff"