mergetools / vimdiff3on commit Merge branch 'ta/config-add-to-empty-or-true-fix' into maint (102edda)
   1. "$MERGE_TOOLS_DIR/vimdiff"