mergetools / gvimdiff2on commit Sync with maint (260dba5)
   1. "$MERGE_TOOLS_DIR/vimdiff"