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