mergetools / vimdiff2on commit Merge branch 'jk/command-line-config-empty-string' into maint (04cd47f)
   1. "$MERGE_TOOLS_DIR/vimdiff"