mergetools / gvimdiff3on commit Merge branch 'sb/remove-unused-var-from-builtin-add' into maint (223b55a)
   1. "$MERGE_TOOLS_DIR/vimdiff"