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