mergetools / vimdiff3on commit Merge branch 'sp/stream-clean-filter' (f0d8900)
   1. "$MERGE_TOOLS_DIR/vimdiff"