mergetools / gvimdiff2on commit Sync with maint (5eada89)
   1. "$MERGE_TOOLS_DIR/vimdiff"