mergetools / vimdiff3on commit Merge branch 'sb/filenames-with-dashes' (89e5aa3)
   1. "$MERGE_TOOLS_DIR/vimdiff"