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