mergetools / vimdiff3on commit Merge branch 'dp/merge-strategy-doc-fix' into next (317e077)
   1. "$MERGE_TOOLS_DIR/vimdiff"