mergetools / gvimdiffon commit Merge branch 'mm/checkout-auto-track-fix' into maint (07c55c0)
   1. "$MERGE_TOOLS_DIR/vimdiff"