mergetools / vimdiff3on commit Merge branch 'cn/bom-in-gitignore' (2e1dfd6)
   1. "$MERGE_TOOLS_DIR/vimdiff"