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