mergetools / vimdiff3on commit Merge branch 'sb/clean-test-fix' into HEAD (10b6646)
   1. "$MERGE_TOOLS_DIR/vimdiff"