mergetools / vimdiff3on commit Merge branch 'jc/report-path-error-to-dir' into maint (ab0fb57)
   1. "$MERGE_TOOLS_DIR/vimdiff"