mergetools / gvimdiff2on commit Sync with maint (2d0b071)
   1. "$MERGE_TOOLS_DIR/vimdiff"