mergetools / vimdiff3on commit Merge branch 'ml/filter-branch-no-op-error' into next (ba8ac48)
   1. "$MERGE_TOOLS_DIR/vimdiff"